desktop simplification

4 files changed, 75 insertions, 1 deletions

diff --git a/.DS_Store b/.DS_Store
index 3fd7a96a..55512dd0 100644
--- a/.DS_Store
+++ b/.DS_Store
diff --git a/.gitignore b/.gitignore
index 26f917fd..80fa2d8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 
 ionic.project
 www/lib/
+desktop/
 node_modules/
 platforms/
 release_files/
diff --git a/make_desktop.sh b/make_desktop.sh
index e6a3c21d..58412c58 100755
--- a/make_desktop.sh
+++ b/make_desktop.sh
@@ -2,6 +2,13 @@
 
 exe() { echo "\$ $@" ; "$@" ; }
 
+if [ ! -d "desktop" ]; then
+	echo "You have not downloaded desktop images"
+	echo "Please run ./prepare_desktop.sh"
+	echo
+	exit
+fi
+
 echo ----------------------------------------------------
 echo Pliable Pixels Desktop build process
 echo ----------------------------------------------------
@@ -9,7 +16,7 @@ APPVER=`cat config.xml | grep "widget " | sed 's/.* version=\"\([^\"]*\)\" xmlns
 APPVER+="D"
 echo "Application version:$APPVER"
 
-declare -a app_ports=("../zmNinja-mac.app/Contents/Resources" "../zmNinja-linux32bit/resources" "../zmNinja-linux64bit/resources" "../zmNinja-win32-64bit/resources"  "../zmNinja-linuxarm/resources")
+declare -a app_ports=("desktop/zmNinja-mac.app/Contents/Resources" "desktop/zmNinja-linux32bit/resources" "desktop/zmNinja-linux64bit/resources" "desktop/zmNinja-win32-64bit/resources"  "desktop/zmNinja-linuxarm/resources")
 
 for i in "${app_ports[@]}"
 do
diff --git a/prepare_desktop.sh b/prepare_desktop.sh
new file mode 100755
index 00000000..50e71aae
--- /dev/null
+++ b/prepare_desktop.sh
@@ -0,0 +1,66 @@
+#!/bin/bash
+
+REL="v1.7.8"
+WGET='wget'
+WGET_ARGS='-q --show-progress'
+UNZIP='unzip'
+UNZIP_ARGS='-d'
+
+exe() { echo "\$ $@" ; "$@" ; }
+
+echo ----------------------------------------------------
+echo Pliable Pixels Desktop preparation process
+echo Use this to download electron images
+echo You really need to do this one time
+echo ----------------------------------------------------
+echo
+
+
+iswget=`which ${WGET}`
+if [ $? -ne 0 ]; then
+    echo "**ERROR** You need ${WGET} installed in your path to use this tool."  
+    exit
+fi
+rm -rf desktop
+mkdir -p desktop 2>/dev/null
+cd desktop
+
+
+declare -a release_names=("darwin-x64" "win32-x64" "linux-arm" "linux-x64" "linux-ia32")
+declare -a release_renames=("zmNinja-mac.app" "zmNinja-win32-64bit" "zmNinja-linuxarm" "zmNinja-linux64bit" "zmNinja-linux32bit")
+
+for i in "${!release_names[@]}"
+do
+    RELEASE="https://github.com/electron/electron/releases/download/${REL}/electron-${REL}-${release_names[$i]}.zip"
+    echo
+    echo "Working on ${RELEASE}..."
+    #echo "Rename to ${release_renames[$i]}"
+    echo "---------------------------------------------"
+    
+    echo "Downloading ${release_names[i]}  ..."
+    exe ${WGET} ${RELEASE} ${WGET_ARGS}
+    
+
+    echo "Decompressing image..."
+    if [ "${release_names[$i]}" != "darwin-x64" ]; then
+        exe mkdir electron-${REL}-${release_names[$i]} >/dev/null 2>&1
+        exe rm -fr electron-${REL}-${release_names[$i]}/* >/dev/null 2>&1
+        exe ${UNZIP}  -f electron-${REL}-${release_names[$i]}.zip  ${UNZIP_ARGS} electron-${REL}-${release_names[$i]} >/dev/null 2>&1
+        exe mv electron-${REL}-${release_names[$i]} ${release_renames[$i]} >/dev/null 2>&1
+    else
+        exe ${UNZIP} -f electron-${REL}-${release_names[$i]}.zip  >/dev/null 2>&1
+        exe mv Electron.app ${release_renames[$i]}
+    fi 
+    
+    rm LICENSE* 2>/dev/null
+    rm version 2>/dev/null
+done
+echo
+echo =========================================================
+echo All done. Use ./make_desktop now
+echo You need to associate icons for OSX and windows
+echo for OSX
+echo =========================================================
+echo
+
+