From: Tobias von der Krone Date: Mon, 29 Jul 2013 07:29:01 +0000 (+0200) Subject: replace test ([ expression ]) with bash internal [[ expression ]] X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=f5f185a39a9acb18c4e6da47f580fbf158c54519;p=profitbricks%2Fjenkins-build-scripts.git replace test ([ expression ]) with bash internal [[ expression ]] --- diff --git a/maven_pre_build_debian_wrapper.sh b/maven_pre_build_debian_wrapper.sh index bd3db73..93445e5 100755 --- a/maven_pre_build_debian_wrapper.sh +++ b/maven_pre_build_debian_wrapper.sh @@ -14,7 +14,7 @@ set -e cd $WORKSPACE # remove old maven repository if exists -[ -d .repository ] && rm .repository -rf && echo "$WORKSPACE/.repository (used by Maven) removed" +[[ -d .repository ]] && rm .repository -rf && echo "$WORKSPACE/.repository (used by Maven) removed" # clean up git git reset --hard # respect build-triggers (triggered from a git commit message containing the string [no-test]) @@ -28,7 +28,7 @@ figlet "$GIT_BRANCH_NAME" git checkout $GIT_BRANCH_NAME git status -if [ ${GIT_BRANCH_NAME:0:8} = "feature/" ] || [ ${GIT_BRANCH_NAME:0:7} = "bugfix/" ]; then +if [[ ${GIT_BRANCH_NAME:0:8} = "feature/" ]] || [[ ${GIT_BRANCH_NAME:0:7} = "bugfix/" ]]; then if [[ "$BUILD_TRIGGERS" == *"merge"* ]]; then # # if triggered to 'merge' via git commit, @@ -42,7 +42,7 @@ if [ ${GIT_BRANCH_NAME:0:8} = "feature/" ] || [ ${GIT_BRANCH_NAME:0:7} = "bugfix figlet "integration merge" git merge --no-ff origin/$GIT_BRANCH_NAME fi -elif [ "$GIT_BRANCH_NAME" = "master" ] || [ "${GIT_BRANCH_NAME:0:7}" = "hotfix/" ]; then +elif [[ "$GIT_BRANCH_NAME" = "master" ]] || [[ "${GIT_BRANCH_NAME:0:7}" = "hotfix/" ]]; then # # check whether we will able to 'git tag' after the build by trying it now #