From 4b2d02b01edd3462681c6de3e1168260e82a5c0d Mon Sep 17 00:00:00 2001
From: nathan <nathan@ntree.com>
Date: Wed, 1 Jun 2016 15:33:17 -0400
Subject: [PATCH] npm run more bug fixes

---
 scripts/apexupdate.sh    | 6 ++++++
 scripts/file-to-apex     | 2 --
 scripts/install_apex.sql | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/scripts/apexupdate.sh b/scripts/apexupdate.sh
index 5e30615..1c06995 100755
--- a/scripts/apexupdate.sh
+++ b/scripts/apexupdate.sh
@@ -53,4 +53,10 @@ rm $export_file
 
 mv f$apexappid apex #
 
+cd apex/
+
+sed s^@application^@apex/application^ < install.sql > temp.sql
+rm -f install.sql
+mv temp.sql install.sql
+
 #now you can update your working copy with changes from your colleagues and reinstall into apex
diff --git a/scripts/file-to-apex b/scripts/file-to-apex
index 05c53dd..20c5fa6 100644
--- a/scripts/file-to-apex
+++ b/scripts/file-to-apex
@@ -2,6 +2,4 @@
 script_folder=$(dirname $(readlink $0))
 $script_folder/check_conf_file.sh || exit 1
 source config/apexupdate.conf || exit 1
-cd apex/ || exit 1
-script_folder=$(dirname $(readlink $0))
 sqlplus $username/$password@$database_connection @$script_folder/install_apex.sql $apexappid $workspace_name $parsing_schema || exit 1
diff --git a/scripts/install_apex.sql b/scripts/install_apex.sql
index 9dc61ce..5106f7b 100755
--- a/scripts/install_apex.sql
+++ b/scripts/install_apex.sql
@@ -15,6 +15,6 @@ begin
   apex_application_install.generate_offset;
 end;
 /
-@install.sql
+@apex/install.sql
 /
 quit