From 84bd5ed856dc3f7471ae631d443fd6792f587067 Mon Sep 17 00:00:00 2001
From: Mario Colque <colquemario@gmail.com>
Date: Thu, 15 May 2014 17:53:02 -0300
Subject: [PATCH] fixed path errors in generator script util

---
 util/build.js                  |  3 ---
 util/generate-app-extension.sh | 27 +++++++++++++++++++++++----
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/util/build.js b/util/build.js
index f1d576c94..b7697782f 100755
--- a/util/build.js
+++ b/util/build.js
@@ -27,9 +27,6 @@ var pack = function (params) {
 var createBundle = function(opts) {
   opts.dir = opts.dir || 'js/';
 
-  // concat browser vendor files
-  exec('sh concat.sh', puts);
-
   var bopts = {
     pack: pack,
     debug: true,
diff --git a/util/generate-app-extension.sh b/util/generate-app-extension.sh
index f065d42e7..c51a2bc5f 100755
--- a/util/generate-app-extension.sh
+++ b/util/generate-app-extension.sh
@@ -2,12 +2,18 @@
 
 #Description: A simple script to compile and copy only the needed files for the web app.
 
-# Moving to root path
-cd ../
+ROOTDIR=`pwd`
+BASENAME=`basename $ROOTDIR`
+
+if [ $BASENAME = "util" ]; then
+  # Moving to root path
+  cd ../
+  ROOTDIR=`pwd`
+fi
 
 # Configs
-APPDIR="./webapp"
-CHROMEDIR="./chrome-extension"
+APPDIR="$ROOTDIR/webapp"
+CHROMEDIR="$ROOTDIR/chrome-extension"
 
 LIBDIR="$APPDIR/lib"
 DOWNLOADDIR="$APPDIR/download"
@@ -22,6 +28,14 @@ Yellow="1;33m"
 Green="1;32m"
 CloseColor="\033[0m"
 
+# Check function OK
+checkOK() {
+  if [ $? != 0 ]; then
+    echo -e "${OpenColor}${Red}* ERROR. Exiting...${CloseColor}"
+    exit 1
+  fi
+}
+
 # Create/Clean temp dir
 echo -e "${OpenColor}${Green}* Checking temp dir...${CloseColor}"
 if [ -d $APPDIR ]; then
@@ -40,22 +54,27 @@ mkdir -p $CHROMEDIR
 # Re-compile copayBundle.js
 echo -e "${OpenColor}${Green}* Generating copay bundle...${CloseColor}"
 grunt --target=dev shell
+checkOK
 
 # Copy all app files
 echo -e "${OpenColor}${Green}* Copying all app files...${CloseColor}"
 cp -af {css,font,img,js,lib,sound,config.js,index.html} $APPDIR
+checkOK
 
 # Copy all chrome-extension files
 echo -e "${OpenColor}${Green}* Copying all chrome-extension files...${CloseColor}"
 cp -af {css,font,img,js,lib,sound,config.js,index.html,popup.html,manifest.json} $CHROMEDIR
+checkOK
 
 # Zipping apps
 echo -e "${OpenColor}${Green}* Zipping all app files...${CloseColor}"
 zip -r $ZIPFILE $APPDIR
+checkOK
 
 # Zipping chrome-extension
 echo -e "${OpenColor}${Green}* Zipping all chrome-extension files...${CloseColor}"
 zip -r $CHROMEZIPFILE $CHROMEDIR
+checkOK
 
 mkdir -p $CHROMEDOWNLOADDIR
 mv $ZIPFILE $DOWNLOADDIR