summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiHO <jiho-sf@users.sourceforge.net>2008-02-17 22:51:00 +0000
committerjiho-sf <jiho-sf@users.sourceforge.net>2008-02-17 22:51:00 +0000
commitbb01f1e11ac825fe55ff43172d9e4bfb97b3eaf5 (patch)
treef602768e72a883f2a0ca537eb0b5f8ba5f95e1b0
parentthe option -e to echo is useless here (diff)
downloadinkscape-bb01f1e11ac825fe55ff43172d9e4bfb97b3eaf5.tar.gz
inkscape-bb01f1e11ac825fe55ff43172d9e4bfb97b3eaf5.zip
- Added system version to the name of the dmg
- corrected syntax for the last test, to open the Finder window when a package or dmg is produced (bzr r4761)
-rwxr-xr-xpackaging/macosx/osx-build.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh
index 0356d413f..dfe365290 100755
--- a/packaging/macosx/osx-build.sh
+++ b/packaging/macosx/osx-build.sh
@@ -267,7 +267,8 @@ fi
# Fetch some information
REVISION=`head -n 4 ../../.svn/entries | tail -n 1`
ARCH=`arch | tr [p,c] [P,C]`
-NEWNAME="Inkscape-$REVISION-$ARCH"
+MINORVERSION=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 -d \.`
+NEWNAME="Inkscape-$REVISION-10.$MINORVERSION-$ARCH"
DMGFILE="$NEWNAME.dmg"
INFOFILE="$NEWNAME-info.txt"
@@ -285,7 +286,7 @@ then
# Prepare information file
echo "Version information on $DATE for `whoami`:
- OS X `/usr/bin/sw_vers | grep ProductVersion | cut -f2 -d \:`
+ OS X `/usr/bin/sw_vers | grep ProductVersion | cut -f2 -d \:`
Architecture $ARCH
DarwinPorts `port version | cut -f2 -d \ `
GCC `gcc --version | grep GCC`
@@ -321,7 +322,7 @@ then
fi
fi
-if [[ "$PACKAGE" == "t" ]] | [[ "$DISTRIB" == "t" ]]; then
+if [[ "$PACKAGE" == "t" || "$DISTRIB" == "t" ]]; then
# open a Finder window here to admire what we just produced
open .
fi