Commit ccc92da6 authored by Julius Athenstaedt's avatar Julius Athenstaedt Committed by sevenuz
Browse files

fix syntax for profiles, e.g. mogon2:0.8.0 or mogon2: for latest

parent 4b2eade5

scripts/compile_dep.sh

+12 −7
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ declare -A PROFILE_CLONEDEPS_ARGS PROFILE_CLONEDEPS_PATCHES 
usage_short() {

	echo "

usage: compile_dep.sh -h |

                      -p DEPENDENCY_NAME[[@PROFILE_NAME][:PROFILE_VERSION]] |

                      -p DEPENDENCY_NAME[[@PROFILE_NAME:][PROFILE_VERSION]] |

                      -l [PROFILE_NAME:[PROFILE_VERSION]] |

                      -h

                      [ -P PROFILES_DIR ] [ -j COMPILE_CORES] [ -n ]
@@ -73,7 +73,7 @@ optional arguments: 
    -h, --help  Shows this help message and exits

    -l, --list-dependencies [[PROFILE_NAME:]PROFILE_VERSION]

                List dependencies available for building and installation

    -p, --profile DEPENDENCY_NAME[[@PROFILE_NAME][:PROFILE_VERSION]]

    -p, --profile DEPENDENCY_NAME[[@PROFILE_NAME:][PROFILE_VERSION]]

                Build and install a specific dependency, ignoring any --profile

                option provided. If PROFILE_NAME is unspecified, the 'default'

                profile will be used. Similarly, if PROFILE_VERSION is
@@ -387,6 +387,16 @@ while [[ $# -gt 0 ]]; do 
                PROFILE_VERSION="${BASH_REMATCH[3]}"

            fi



        # e.g. default:latest

        elif [[ "$2" =~ ^(.*):(.*)$ ]]; then

            if [[ -n "${BASH_REMATCH[1]}" ]]; then

                PROFILE_NAME="${BASH_REMATCH[1]}"

            fi



            if [[ -n "${BASH_REMATCH[2]}" ]]; then

                PROFILE_VERSION="${BASH_REMATCH[2]}"

            fi



        # e.g. mercury@mogon1

        elif [[ "$2" =~ ^(.*)@(.*)$ ]]; then

            if [[ -n "${BASH_REMATCH[1]}"  ]]; then
@@ -401,11 +411,6 @@ while [[ $# -gt 0 ]]; do 
            DEPENDENCY="$2"

        fi



        if [[ ! -n "${DEPENDENCY}" ]]; then

            echo "ERROR: Missing dependency name."

            exit 1

        fi



        shift # past argument

        shift # past value

        ;;

scripts/dl_dep.sh

+12 −7
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ wgetdeps() { 


usage_short() {

    echo "

usage: dl_dep.sh -p DEPENDENCY_NAME[[@PROFILE_NAME][:PROFILE_VERSION]] |

usage: dl_dep.sh -p DEPENDENCY_NAME[[@PROFILE_NAME:][PROFILE_VERSION]] |

                 -l [[PROFILE_NAME:]PROFILE_VERSION] |

                 -h

                 [ -P PROFILES_DIR ] [ -n ]
@@ -329,7 +329,7 @@ optional arguments: 
        -h, --help              Shows this help message and exits

        -l, --list-dependencies [[PROFILE_NAME:]PROFILE_VERSION]

                                List dependency configuration profiles available for download

        -p, --profile DEPENDENCY_NAME[[@PROFILE_NAME][:PROFILE_VERSION]]

        -p, --profile DEPENDENCY_NAME[[@PROFILE_NAME:][PROFILE_VERSION]]

                                Build and install a specific dependency, ignoring any --profile

                                option provided. If PROFILE_NAME is unspecified, the 'default'

                                profile will be used. Similarly, if PROFILE_VERSION is unspecified,
@@ -379,6 +379,16 @@ while [[ $# -gt 0 ]]; do 
                PROFILE_VERSION="${BASH_REMATCH[3]}"

            fi



        # e.g. default:latest

        elif [[ "$2" =~ ^(.*):(.*)$ ]]; then

            if [[ -n "${BASH_REMATCH[1]}" ]]; then

                PROFILE_NAME="${BASH_REMATCH[1]}"

            fi



            if [[ -n "${BASH_REMATCH[2]}" ]]; then

                PROFILE_VERSION="${BASH_REMATCH[2]}"

            fi



        # e.g. mercury@mogon1

        elif [[ "$2" =~ ^(.*)@(.*)$ ]]; then

            if [[ -n "${BASH_REMATCH[1]}"  ]]; then
@@ -393,11 +403,6 @@ while [[ $# -gt 0 ]]; do 
            DEPENDENCY="$2"

        fi



        if [[ ! -n "${DEPENDENCY}" ]]; then

            echo "ERROR: Missing dependency name."

            exit 1

        fi



        shift # past argument

        shift # past value

        ;;

scripts/gkfs_dep.sh

+4 −16
Original line number Diff line number Diff line
@@ -32,8 +32,7 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" 
usage_short() {

	echo "

usage: compile_dep.sh -h |

                      -p PROFILE_NAME[:PROFILE_VERSION] |

                      -d DEPENDENCY_NAME[[@PROFILE_NAME][:PROFILE_VERSION]] |

                      -p DEPENDENCY_NAME[[@PROFILE_NAME:][PROFILE_VERSION]] |

                      -l [PROFILE_NAME:[PROFILE_VERSION]] |

                      -h

                      [ -P PROFILES_DIR ] [ -j COMPILE_CORES] [ -n ] [ -v ]
@@ -56,7 +55,7 @@ optional arguments: 
    -h, --help  Shows this help message and exits

    -l, --list-dependencies [[PROFILE_NAME:]PROFILE_VERSION]

                        List dependencies available for building and installation

    -p, --profile PROFILE_NAME[:PROFILE_VERSION]

    -p, --dependency DEPENDENCY_NAME[[@PROFILE_NAME:][PROFILE_VERSION]]

                        Allows installing a pre-defined set of dependencies as defined

                        in \${PROFILES_DIR}/PROFILE_NAME.specs. This is useful to

                        deploy specific library versions and/or configurations,
@@ -65,7 +64,6 @@ optional arguments: 
                        'ngio:0.9.3', which will download the dependencies defined for

                        that specific version. If unspecified, the 'default:latest' profile

                        will be used, which should include all the possible dependencies.

    -d, --dependency DEPENDENCY_NAME[[@PROFILE_NAME][:PROFILE_VERSION]]

                        Build and install a specific dependency, ignoring any --profile

                        option provided. If PROFILE_NAME is unspecified, the 'default'

                        profile will be used. Similarly, if PROFILE_VERSION is
@@ -100,11 +98,6 @@ while [[ $# -gt 0 ]]; do 
        shift # past argument

        shift # past value

        ;;

    -d | --dependency)

        DEPENDENCY="$2"

        shift # past argument

        shift # past value

        ;;

    -j | --compilecores)

        COMPILE_ARGS="$COMPILE_ARGS -j $2"

        shift # past argument
@@ -156,12 +149,7 @@ fi 
SOURCE_DIR="$(readlink -mn "${1}")"

INSTALL_DIR="$(readlink -mn "${2}")"

# build arguments

if [[ -n $DEPENDENCY ]]; then

    PROFILE_STR="-d $DEPENDENCY"

if [[ -n $PROFILE ]]; then

        PROFILE_STR="$PROFILE_STR@$PROFILE"

    fi

elif [[ -n $PROFILE ]]; then

    PROFILE_STR="-p $PROFILE"

fi

if [[ -n $PROFILE_STR ]]; then