From 86d70ba950fb5adffdd6900a77ac6abb6bba2bdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacek=20G=C4=99bal?= <jgebal@gmail.com>
Date: Wed, 24 Aug 2016 00:02:53 +0100
Subject: [PATCH] Project root directory cleanup. Moved shell scripts into
 .travis directory

---
 .travis.yml                        |  6 +++---
 .travis/create_utplsql_user.sql    | 16 +++++++++++++++
 examples.sh => .travis/examples.sh |  0
 install.sh => .travis/install.sh   |  5 +++--
 test.sh => .travis/test.sh         |  0
 install/create_utplsql_user.sql    | 33 ------------------------------
 6 files changed, 22 insertions(+), 38 deletions(-)
 create mode 100644 .travis/create_utplsql_user.sql
 rename examples.sh => .travis/examples.sh (100%)
 rename install.sh => .travis/install.sh (57%)
 rename test.sh => .travis/test.sh (100%)
 delete mode 100644 install/create_utplsql_user.sql

diff --git a/.travis.yml b/.travis.yml
index 7e749cbd1..2c833f2ab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,9 +42,9 @@ install:
   - bash .travis/oracle/install.sh
 
 script:
-  - bash install.sh
-  - bash examples.sh
-  - bash test.sh
+  - bash .travis/install.sh
+  - bash .travis/examples.sh
+  - bash .travis/test.sh
 
 notifications:
   slack: utplsql:oiMuXO95TvKeAUENuDt4cPrB
diff --git a/.travis/create_utplsql_user.sql b/.travis/create_utplsql_user.sql
new file mode 100644
index 000000000..83c1f0fda
--- /dev/null
+++ b/.travis/create_utplsql_user.sql
@@ -0,0 +1,16 @@
+whenever sqlerror exit failure rollback
+whenever oserror exit failure rollback
+set echo off
+set feedback off
+set heading off
+set verify off
+
+define ut3_user       = &1
+define ut3_pass       = &2
+define ut3_tablespace = &3
+
+create user &ut3_user identified by &ut3_pass default tablespace &ut3_tablespace quota unlimited on &ut3_tablespace;
+
+grant create session, create procedure, create type, create table to &ut3_user;
+
+exit success
diff --git a/examples.sh b/.travis/examples.sh
similarity index 100%
rename from examples.sh
rename to .travis/examples.sh
diff --git a/install.sh b/.travis/install.sh
similarity index 57%
rename from install.sh
rename to .travis/install.sh
index 1739e5fc0..53fdaf437 100644
--- a/install.sh
+++ b/.travis/install.sh
@@ -1,10 +1,11 @@
 #!/bin/bash
 
 set -ev
-
+echo "$(dirname "$(readlink -f "$0")")"
 #create user
 "$ORACLE_HOME/bin/sqlplus" -L -S / AS SYSDBA <<SQL
-@@install/create_utplsql_user.sql ut3 ut3 users
+set echo off
+@@$(dirname "$(readlink -f "$0")")/create_utplsql_user.sql ut3 ut3 users
 SQL
 
 cd source
diff --git a/test.sh b/.travis/test.sh
similarity index 100%
rename from test.sh
rename to .travis/test.sh
diff --git a/install/create_utplsql_user.sql b/install/create_utplsql_user.sql
deleted file mode 100644
index bf882de7f..000000000
--- a/install/create_utplsql_user.sql
+++ /dev/null
@@ -1,33 +0,0 @@
-whenever sqlerror exit failure rollback
-whenever oserror exit failure rollback
-
-set echo off
-set feedback off
-set heading off
-set verify off
-
---make SQLPLUS parameters optional
-column 1 new_value 1
-column 2 new_value 2
-column 3 new_value 3
-select '' "1", '' "2", '' "3" from dual where rownum = 0;
-
-
-column ut3_user       new_value ut3_user
-column ut3_pass       new_value ut3_pass
-column ut3_tablespace new_value ut3_tablespace
---do not show the values
-set termout off
-select nvl('&&1', default_user) as ut3_user,
-       nvl('&&2', default_pass) as ut3_pass,
-       nvl('&&3', default_ts) as ut3_tablespace
-  from (select 'ut3'   as default_user,
-               'ut3'   as default_pass,
-               'users' as default_ts
-          from dual);
-
-create user &ut3_user identified by &ut3_pass default tablespace &ut3_tablespace;
-
-grant create session, create procedure, create type, create table to &ut3_user;
-
-exit success