diff options
| author | don bright <hugh.m.bright@gmail.com> | 2012-08-04 17:22:40 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2012-08-04 17:22:40 (GMT) |
| commit | 72462e4d0f49740e57be374cfc1fdeeb668ae913 (patch) | |
| tree | 54adedffceef575857a707a2d126175f94582a1b /scripts | |
| parent | 81df2f9c5fd55406baf0f53550c7aae1b60df2cf (diff) | |
cleanup OSTYPE
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/publish-mingw-x.sh | 2 | ||||
| -rwxr-xr-x | scripts/release-common.sh | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/scripts/publish-mingw-x.sh b/scripts/publish-mingw-x.sh index 0dc99ea..4e0afe9 100755 --- a/scripts/publish-mingw-x.sh +++ b/scripts/publish-mingw-x.sh @@ -27,7 +27,7 @@ if [ ! -f $OPENSCADDIR/openscad.pro ]; then exit 0 fi -OS=LINXWIN ./scripts/release-common.sh -v $VERSION $COMMIT +OSTYPE=mingw-cross-env ./scripts/release-common.sh -v $VERSION $COMMIT if [ $? != 0 ]; then echo "release-common.sh returned error code: $?. build stopped." diff --git a/scripts/release-common.sh b/scripts/release-common.sh index fb7df40..e449e1f 100755 --- a/scripts/release-common.sh +++ b/scripts/release-common.sh @@ -2,11 +2,11 @@ # # This script creates a binary release of OpenSCAD. # This should work under Mac OS X, Windows (msys), and Linux cross-compiling -# for windows using mingw-cross-env (use like: OS=LINXWIN release-common.sh). +# for windows using mingw-cross-env (use like: OSTYPE=mingw-cross-env release-common.sh). # Linux support pending. # The script will create a file called openscad-<versionstring>.zip # in the current directory (or in the $DEPLOYDIR of a mingw cross build) -# +# # Usage: release-common.sh [-v <versionstring>] [-c] # -v Version string (e.g. -v 2010.01) # -c Build with commit info @@ -30,10 +30,6 @@ if [ ! -f $OPENSCADDIR/openscad.pro ]; then exit 0 fi -if [ $OS == "LINXWIN" ]; then - OSTYPE=mingw-cross-env -fi - if [[ "$OSTYPE" =~ "darwin" ]]; then OS=MACOSX elif [[ $OSTYPE == "msys" ]]; then |