diff options
author | don bright <hugh.m.bright@gmail.com> | 2012-08-05 01:04:40 (GMT) |
---|---|---|
committer | don bright <hugh.m.bright@gmail.com> | 2012-08-05 01:04:40 (GMT) |
commit | db53bdb496eef048831369b888c775bf0e82b82f (patch) | |
tree | 42ec18340bc3a6e77799417e056fec65bec50ca8 /scripts/release-common.sh | |
parent | 58db7a9d19f707c72a3f16bdf6275c0e4671f362 (diff) |
1. fix bug in detecting makensis
2. better error message for MXE not being found
Diffstat (limited to 'scripts/release-common.sh')
-rwxr-xr-x | scripts/release-common.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/release-common.sh b/scripts/release-common.sh index dfebe13..202efaa 100755 --- a/scripts/release-common.sh +++ b/scripts/release-common.sh @@ -67,9 +67,9 @@ case $OS in LINXWIN) MAKENSIS= - if [ ! "`command -v makensis`" ]; then + if [ "`command -v makensis`" ]; then MAKENSIS=makensis - elif [ ! "`command -v i686-pc-mingw32-makensis`" ]; then + elif [ "`command -v i686-pc-mingw32-makensis`" ]; then MAKENSIS=i686-pc-mingw32-makensis else echo "makensis not found. please install nsis" @@ -189,10 +189,10 @@ if [ -n $LIBRARYDIR ]; then mkdir -p $LIBRARYDIR # exclude the .git stuff from MCAD which is a git submodule. # tar is a relatively portable way to do exclusion - rm libraries.tar + rm -f libraries.tar tar cf libraries.tar --exclude=.git* libraries cd $LIBRARYDIR/.. && tar xf $OPENSCADDIR/libraries.tar && cd $OPENSCADDIR - rm libraries.tar + rm -f libraries.tar chmod -R u=rwx,go=r,+X $LIBRARYDIR/* fi |