From 61568bcdab73ae19b57b00c17158372dd326a36c Mon Sep 17 00:00:00 2001
From: Giorgos Korfiatis <gkorf@grnet.gr>
Date: Thu, 3 Sep 2015 16:48:26 +0300
Subject: [PATCH] adapt install scripts for resources dir
---
get_nwjs.sh | 2 +-
make_package.sh | 8 +++-----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/get_nwjs.sh b/get_nwjs.sh
index f844ca4..094aefa 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 423f745..2bc0a80 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
--
GitLab