diff --git a/Linux-Builds/bin/build_hpcc.sh b/Linux-Builds/bin/build_hpcc.sh index 8aa9691..9754e6b 100755 --- a/Linux-Builds/bin/build_hpcc.sh +++ b/Linux-Builds/bin/build_hpcc.sh @@ -19,7 +19,7 @@ usage() { 8: Graphcontrol (deb only) 9: Ganglia-monitoring 10: Nagios-monitoring - 11: Docs (Ubuntu 12.04 precise only) + 11: Docs (Ubuntu 12.04 or 14.04 only) -r|--release: HPCC release version. Example, 5.0.0-1 -u|--user: github user. Default is hpcc-systems It can be multiple users for multiple branches separated by ','. diff --git a/Linux-Builds/bin/github/github_gm b/Linux-Builds/bin/github/github_gm index 44ee772..f7a551b 100755 --- a/Linux-Builds/bin/github/github_gm +++ b/Linux-Builds/bin/github/github_gm @@ -4,7 +4,19 @@ curDir=$(dirname $0) . ${curDir}/github_common [ -z "$1" ] && echo "Miss tag or branch name" && exit 1 -TAG_BRANCH_NAME=$1 + +get_user_and_branch $1 ${github_user} + +match_branch_suffix $branch2 +if [ $? -eq 0 ] +then + TAG_BRANCH_NAME=ganglia-monitoring_$branch2 +else + TAG_BRANCH_NAME=$branch2 +fi + +${curDir}/github_ce $1 OFF +[ $? -ne 0 ] && exit 1 GM_DIR=ganglia-monitoring diff --git a/Linux-Builds/bin/github/github_nm b/Linux-Builds/bin/github/github_nm index eb009de..b1c3862 100755 --- a/Linux-Builds/bin/github/github_nm +++ b/Linux-Builds/bin/github/github_nm @@ -3,18 +3,21 @@ curDir=$(dirname $0) . ${curDir}/github_common -[ -z "$1" ] && echo "Miss tag or branch name" && exit 1 -match_branch_suffix $1 + -z "$1" ] && echo "Miss tag or branch name" && exit 1 + +get_user_and_branch $1 ${github_user} + +match_branch_suffix $branch2 if [ $? -eq 0 ] then - TAG_BRANCH_NAME=nagios-monitoring_$1 + TAG_BRANCH_NAME=nagios-monitoring_$branch2 else - TAG_BRANCH_NAME=$1 + TAG_BRANCH_NAME=$branch2 fi - -${curDir}/github_ce $TAG_BRANCH_NAME OFF +${curDir}/github_ce $1 OFF +[ $? -ne 0 ] && exit 1 NM_DIR=nagios-monitoring