strip the single quotes around $VERSION

[tahoe-lafs/tahoe-lafs.git] / misc / build_helpers / build-osx-pkg.sh

diff --git a/misc/build_helpers/build-osx-pkg.sh b/misc/build_helpers/build-osx-pkg.sh
index b5d1d7b64c9b6ac76070782d05abac97c6003ebe..52f01098dcfbe69a24d84459ed1f7097a1e75d28 100755 (executable)
--- a/misc/build_helpers/build-osx-pkg.sh
+++ b/misc/build_helpers/build-osx-pkg.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 APPNAME=$1
-VERSION=$2
+VERSION=`sh -c "cat src/allmydata/_version.py | grep verstr | head -n 1 | cut -d' ' -f 3" | sed "s/'//g"`
 PWD=`pwd`
 
 # The editing of allmydata-tahoe.egg-link and easy-install.pth files
@@ -12,18 +12,18 @@ find support -name $APPNAME.egg-link -execdir sh -c "echo >> {}; echo /Applicati
 find support -name easy-install.pth -execdir sed -i.bak 's|^.*/src$|../../../../src|' '{}' \;
 
 # create component pkg
-pkgbuild --root $PWD \
+pkgbuild --root "$PWD" \
          --identifier com.leastauthority.tahoe \
-         --version $VERSION \
+         --version "$VERSION" \
          --ownership recommended \
          --install-location /Applications/tahoe.app \
-         --scripts $PWD/misc/build_helpers/osx/scripts \
+         --scripts "$PWD/misc/build_helpers/osx/scripts" \
          tahoe-lafs.pkg
 
 # create product archive
-productbuild --distribution $PWD/misc/build_helpers/osx/Distribution.xml \
+productbuild --distribution "$PWD/misc/build_helpers/osx/Distribution.xml" \
              --package-path . \
-             tahoe-lafs-osx.pkg
+             "tahoe-lafs-$VERSION-osx.pkg"
 
 # remove intermediate pkg
 rm -f tahoe-lafs.pkg