From 7805e0799dea82116fa39d4e5f4771111840142c Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Sun, 4 Sep 2016 16:36:19 -0400 Subject: tweaks Former-commit-id: ea89c41bc01316587e010b8760f76a6353a27ced --- make_desktop.sh | 9 +++++++-- maketag.sh | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/make_desktop.sh b/make_desktop.sh index dab9d05a..3fe6fb5a 100755 --- a/make_desktop.sh +++ b/make_desktop.sh @@ -15,7 +15,10 @@ for i in "${app_ports[@]}" do if [ -d "$i" ]; then DIRNAME=`expr "$i" : '\.\./\(.*\)/'` - ZIPNAME=$DIRNAME".zip" + echo "Dirname:" $DIRNAME + PDIRNAME=`echo "$DIRNAME" | sed "s/\/Contents//" ` + echo "Pdirname:" $PDIRNAME + ZIPNAME="${PDIRNAME}_${APPVER}.zip" echo "------------------------------------------------------------------------" echo "Working on packaging $i" echo "------------------------------------------------------------------------" @@ -34,8 +37,10 @@ if [ -d "$i" ]; then exe asar pack app app.asar exe rm -fr app exe cd - - #echo "creating build ZIP" + #OSX ditto does a better job than zip! + #echo "Creating ZIP $ZIPNAME..." #exe zip -r ../$ZIPNAME ../$DIRNAME + echo "Done!" else diff --git a/maketag.sh b/maketag.sh index f5abe316..1dbe7a32 100755 --- a/maketag.sh +++ b/maketag.sh @@ -3,5 +3,5 @@ read -p "Please generate CHANGELOG and commit it BEFORE you tag. Press a key whe orig=$1 VER="${orig/v//}" echo "Creating tag:$VER" -git tag -fa v$VER -m'v$VER' +git tag -fa v$VER -m"v$VER" git push -f --tags -- cgit v1.2.3