From db53bdb496eef048831369b888c775bf0e82b82f Mon Sep 17 00:00:00 2001
From: don bright <hugh.m.bright@gmail.com>
Date: Sun, 5 Aug 2012 03:04:40 +0200
Subject: 1. fix bug in detecting makensis 2. better error message for MXE not
 being found


diff --git a/scripts/publish-mingw-x.sh b/scripts/publish-mingw-x.sh
index 4e0afe9..d6cebcd 100755
--- a/scripts/publish-mingw-x.sh
+++ b/scripts/publish-mingw-x.sh
@@ -16,15 +16,19 @@ CCACHE_DISABLE=1
 . ./scripts/setenv-mingw-xbuild.sh
 
 if [ ! -e $MXEDIR ]; then
-	echo "Mingw cross tools not found."
-	echo " Please run ./scripts/mingw-x-build-dependencies.sh to install "
-	echo " or modify MXEDIR to point to the root of your cross-tools setup"
-	echo " ( Please see setenv-mingw-xbuild.sh for more info ) "
+  echo "MXEDIR: $MXEDIR"
+  echo "MXEDIR is a non-existent path. Mingw cross tools not found."
+  echo
+  echo " Please run ./scripts/mingw-x-build-dependencies.sh to install MXE"
+  echo " or modify MXEDIR to point to the root of your cross-tools setup"
+  echo " ( Please see http://mxe.cc for more info ) "
+  echo
+  exit 1
 fi
 
 if [ ! -f $OPENSCADDIR/openscad.pro ]; then
   echo "Must be run from the OpenSCAD source root directory"
-  exit 0
+  exit 1
 fi
 
 OSTYPE=mingw-cross-env ./scripts/release-common.sh -v $VERSION $COMMIT
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
 
-- 
cgit v0.10.1