Changer install.sh to be runnable from both sqlplus and sqlcl.

jgebal · jgebal · commit 248b24375907 · 2017-07-28T09:23:15.000+01:00
Added output for dropping synonyms.
diff --git a/.travis.yml b/.travis.yml
@@ -23,6 +23,7 @@ env:
   global:
     - UT3_OWNER=ut3
     - UT3_OWNER_PASSWORD=ut3
+    - UT3_RELEASE_VERSION_SCHEMA=UT3_LATEST_RELEASE
     - UT3_USER="UT3\$USER#"
     - UT3_USER_PASSWORD=ut3
     - UT3_TABLESPACE=users
diff --git a/.travis/install.sh b/.travis/install.sh
@@ -1,14 +1,13 @@
 #!/bin/bash
 
-cd "$(dirname "$(readlink -f "$0")")"
+cd source
 set -ev
 #install core of utplsql
 "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
-pwd
 set feedback off
 set verify off
 
-@../source/install_headless.sql $UT3_OWNER $UT3_OWNER_PASSWORD
+@install_headless.sql $UT3_OWNER $UT3_OWNER_PASSWORD
 SQL
 
 "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
@@ -19,23 +18,10 @@ grant select any dictionary to $UT3_OWNER;
 grant create any procedure, drop any procedure, execute any procedure to $UT3_OWNER;
 
 set feedback off
-@../source/create_utplsql_owner.sql $UT3_USER $UT3_USER_PASSWORD $UT3_TABLESPACE
+@create_utplsql_owner.sql $UT3_USER $UT3_USER_PASSWORD $UT3_TABLESPACE
 
-cd ..
-
---enable plsql debug
---cd development
---@ut_debug_enable.sql
---cd ..
-
---cd source
---@install.sql $UT3_OWNER
---@create_synonyms_and_grants_for_user.sql $UT3_OWNER $UT3_USER
---cd ..
-
-cd development
 conn $UT3_OWNER/$UT3_OWNER_PASSWORD@//$CONNECTION_STR
-@utplsql_style_check.sql
+@../development/utplsql_style_check.sql
 
 exit
 SQL
diff --git a/.travis/install_utplsql_release.sh b/.travis/install_utplsql_release.sh
@@ -1,11 +1,13 @@
 #!/bin/bash
 
-RELEASE_VERSION_SCHEMA=UT3_LATEST_RELEASE
 set -ev
 
 cd $UTPLSQL_DIR/source
 
-"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<-SQL
+"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<SQL
+set serveroutput on
+set linesize 200
+set trimspool on
 declare
   i integer := 0;
 begin
@@ -29,14 +31,14 @@ begin
         dbms_output.put_line('FAILED to drop '||syn.syn_name||' for object '||syn.for_object);
     end;
   end loop;
-  dbms_output.put_line('&&line_separator');
   dbms_output.put_line(i||' synonyms dropped');
 end;
 /
 SQL
-"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA @install_headless.sql ${RELEASE_VERSION_SCHEMA}
+
+"$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA @install_headless.sql ${UT3_RELEASE_VERSION_SCHEMA}
 
 "$SQLCLI" sys/$ORACLE_PWD@//$CONNECTION_STR AS SYSDBA <<SQL
-grant select any dictionary to ${RELEASE_VERSION_SCHEMA};
+grant select any dictionary to ${UT3_RELEASE_VERSION_SCHEMA};
 exit
 SQL
