Eirik Hatlen / ctools

Commit a5805388a73d765f27ea666e5e3cc3d39221e5ba

Authored by Jürgen Knödlseder
1 parent c0738cc6

Correct package build script for release

Inline Side-by-side
Showing 1 changed file with 5 additions and 1 deletions
dev/pkgbuild-macosx.sh
  View file @a580538
@@ -174,10 +174,12 @@ if [ ! -d "$GAMMALIB" ]; then @@ -174,10 +174,12 @@ if [ ! -d "$GAMMALIB" ]; then
174 rm -rf $GAMMALIB.tar.gz 174 rm -rf $GAMMALIB.tar.gz
175 cd $GAMMALIB 175 cd $GAMMALIB
176 fi 176 fi
  177 +else
  178 + cd $GAMMALIB
177 fi 179 fi
178 # If we got code from GitLab, then try using release branch, and if not 180 # If we got code from GitLab, then try using release branch, and if not
179 # available, use devel branch. 181 # available, use devel branch.
180 -USE_BRANCH= 182 +USE_BRANCH=release
181 if [ -d ".git" ]; then 183 if [ -d ".git" ]; then
182 git fetch 184 git fetch
183 git checkout release 185 git checkout release
@@ -231,6 +233,8 @@ if [ ! -d "$CTOOLS" ]; then @@ -231,6 +233,8 @@ if [ ! -d "$CTOOLS" ]; then
231 rm -rf $CTOOLS.tar.gz 233 rm -rf $CTOOLS.tar.gz
232 cd $CTOOLS 234 cd $CTOOLS
233 fi 235 fi
  236 +else
  237 + cd $CTOOLS
234 fi 238 fi
235 # If we got code from GitLab, then use the same branch that was used for 239 # If we got code from GitLab, then use the same branch that was used for
236 # GammaLib 240 # GammaLib