Merge pull request #52 from SuperNETorg/submodule-addon

Submodule addon for EasyDEX-GUI

.gitignore

@@ -47,11 +47,5 @@ genesis
 DB
 coins
 
-# Ignore all EasyDEX-GUI subfolder files, except README
-EasyDEX-GUI
-Iguana-GUI
-#EasyDEX-GUI/*
-#!EasyDEX-GUI/README
-
 # Electron-builder related folders
-build
+build

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "gui/EasyDEX-GUI"]
+	path = gui/EasyDEX-GUI
+	url = https://github.com/SuperNETorg/EasyDEX-GUI.git

README.md

@@ -4,15 +4,9 @@ Desktop App for SuperNET DAPPs
 #### For Developers
 You must have `node.js` and `npm` installed on your machine.
 
-Clone Iguana Desktop App
+Clone Iguana Desktop App with EasyDEX-GUI submodule
 ```shell
-git clone https://github.com/SuperNETorg/iguana.git
+git clone --recursive https://github.com/SuperNETorg/iguana.git
-```
-
-Please clone EasyDEX-GUI from github repo here.
-```shell
-cd gui
-git clone https://github.com/SuperNETorg/EasyDEX-GUI.git
 ```
 
 Install Iguana App

check_submodule.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+### Script will check EasyDEX-GUI submodule in gui folder. 
+### If you used git clone without --recursive option this is way to go.
+
+PWD=`pwd`
+SIZE=`du -sk gui/EasyDEX-GUI`
+
+echo "Checking EasyDEX-GUI folder."
+cd gui/EasyDEX-GUI && \
+git submodule update --init --recursive && \
+cd ../.. && \
+echo "Folder looks fine." || \
+echo "Some problem with cloning submodule EasyDEX-GUI." 
+echo

gui/EasyDEX-GUI

@@ -0,0 +1 @@
+Subproject commit 35c5b3a751e43ed76ab7fc60034b8d5ac252aec2

pull-gui.sh

@@ -1,36 +0,0 @@
-#!/usr/bin/env bash
-if [ -d "tmp" ]; then
-  cd tmp
-else
-  mkdir tmp
-  cd tmp
-fi
-
-if [ -d "EasyDEX-GUI" ]; then
-  cd EasyDEX-GUI
-  git pull
-  cd ../
-else
-  git clone https://github.com/SuperNETorg/EasyDEX-GUI.git
-fi
-
-#if [ -d "Iguana-application" ]; then
-#  cd Iguana-application
-#  git checkout 0.3.1
-#  git pull
-#else
-#  git clone https://github.com/SuperNETorg/Iguana-application.git -b 0.3.1
-#  cd Iguana-application
-#fi
-
-#bower install
-#npm install
-#gulp electron
-
-cd ../../
-
-rm "gui/EasyDEX-GUI" -rf
-#rm "gui/Iguana-GUI" -rf
-
-#cp -rf "tmp/Iguana-application/compiled/prod" "gui/Iguana-GUI"
-cp -rf "tmp/EasyDEX-GUI" "gui/EasyDEX-GUI"