From ca0000d7b2d1e3b19aefc77b28d7d03e18cdb6b3 Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Mon, 6 Mar 2017 16:22:45 -0600 Subject: [PATCH] properly check appveyor repo branch or set to unknown --- package/deploy-bintray.sh | 2 ++ package/osx/make_dmg.sh | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/deploy-bintray.sh b/package/deploy-bintray.sh index 7f33151a9..5d5eaa874 100755 --- a/package/deploy-bintray.sh +++ b/package/deploy-bintray.sh @@ -18,6 +18,8 @@ else if [ -z ${GIT_BRANCH+x} ]; then echo "Setting to APPVEYOR_REPO_BRANCH" current_branch=$APPVEYOR_REPO_BRANCH + elif [ -z ${APPVEYOR_REPO_BRANCH+x} ]; then + current_branch="unknown" else echo "Setting to GIT_BRANCH" current_branch=$(echo $GIT_BRANCH | cut -d / -f 2) diff --git a/package/osx/make_dmg.sh b/package/osx/make_dmg.sh index 4bcd7c914..fc8ab830d 100755 --- a/package/osx/make_dmg.sh +++ b/package/osx/make_dmg.sh @@ -28,15 +28,14 @@ else if [ -z ${GIT_BRANCH+x} ]; then echo "Setting to APPVEYOR_REPO_BRANCH" current_branch=$APPVEYOR_REPO_BRANCH + elif [ -z ${APPVEYOR_REPO_BRANCH+x} ]; then + current_branch="unknown" else echo "Setting to GIT_BRANCH" current_branch=$(echo $GIT_BRANCH | cut -d / -f 2) fi fi -if [ -z ${current_branch+x} ]; then - current_branch="unknown" -fi # If we're on a branch, add the branch name to the app name. if [ "$current_branch" == "master" ]; then appname=Slic3r