diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2014-08-24 23:20:48 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2014-08-24 23:20:48 +0000 |
| commit | 457b72ec3ce08e11d6beb6bf39e7c13b3c47900b (patch) | |
| tree | 8e485b166a8511a7e4f783645037d56a56482812 | |
| parent | Use Inkscape icon for osascript dialog (diff) | |
| download | inkscape-457b72ec3ce08e11d6beb6bf39e7c13b3c47900b.tar.gz inkscape-457b72ec3ce08e11d6beb6bf39e7c13b3c47900b.zip | |
osx-build.sh: if repo is checkout use 'bzr update', else 'bzr pull'.
(is there a better way to check binding state with bzr?)
(bzr r13506.1.43)
| -rwxr-xr-x | packaging/macosx/osx-build.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh index b82b038c8..8c759b6e1 100755 --- a/packaging/macosx/osx-build.sh +++ b/packaging/macosx/osx-build.sh @@ -262,7 +262,14 @@ function getinkscapeinfo () { if [[ "$BZRUPDATE" == "t" ]] then cd $SRCROOT - bzr pull + if [ -z "$(bzr info | grep "checkout")" ]; then + echo "repo is unbound (branch)" + update_cmd="bzr pull" + else + echo "repo is bound (checkout)" + update_cmd="bzr update" + fi + $update_cmd status=$? if [[ $status -ne 0 ]]; then echo -e "\nBZR update failed" |