diff --git a/get_nwjs.sh b/get_nwjs.sh index f844ca4323d2d5052997f1a2f32d19e5c3553dce..094aefa68babdb5d4a8f775cbc95b6bb5fa570fb 100755 --- a/get_nwjs.sh +++ b/get_nwjs.sh @@ -39,7 +39,7 @@ url="http://dl.nwjs.io/${VERSION}/"$file echo "Will first download nwjs." AGKPATH=agkyra -NWJSPATH=$AGKPATH/nwjs +NWJSPATH=$AGKPATH/resources/nwjs if [ -d $NWJSPATH ]; then echo "Warning: cleaning up $NWJSPATH." rm -r $NWJSPATH diff --git a/make_package.sh b/make_package.sh index 423f74560b230a75dddcaafdbd71d73e54ad4bcd..2bc0a8061c7790ffb8eb248522fc959fdeee747c 100755 --- a/make_package.sh +++ b/make_package.sh @@ -42,15 +42,13 @@ rm -r $WHEELHOUSE cp $ROOTPATH/COPYING $TMPAGKYRA cp $ROOTPATH/README.md $TMPAGKYRA -cp $ROOTPATH/agkyra/scripts/gui.py $TMPAGKYRA/agkyra +cp $ROOTPATH/agkyra/scripts/agkyra $TMPAGKYRA/agkyra cp $ROOTPATH/agkyra/scripts/cli.py $TMPAGKYRA/agkyra-cli cd $TMPDIR ARCHIVENAME=$CURPWD/agkyra-snapshot-${os} if [[ "$os" =~ ^(linux64|linux32)$ ]]; then tar czf ${ARCHIVENAME}.tar.gz agkyra -elif [[ "$os" =~ ^(osx64|osx32)$ ]]; then - mkdir -p agkyra.app/Contents - mv agkyra agkyra.app/Contents/MacOS - zip -r ${ARCHIVENAME}.zip agkyra.app +else + zip -r ${ARCHIVENAME}.zip agkyra fi