Fixing scripts

Author: jgebal

.travis/install_demo_project.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -ev
+set -evx
 cd $(dirname $(readlink -f $0))
 
 PROJECT_FILE="utPLSQL-demo-project"
@@ -13,7 +13,7 @@ grant select any dictionary to ${DB_USER};
 exit
 SQL
 
-cd ${PROJECT_FILE}
+cd /${PROJECT_FILE}
 sqlplus -S -L ${DB_USER}/${DB_PASS}@//127.0.0.1:1521/xe <<SQL
 whenever sqlerror exit failure rollback
 whenever oserror  exit failure rollback
@@ -39,6 +39,6 @@ exit
 SQL
 EOF
 
-docker cp ./$PROJECT_FILE $ORACLE_VERSION:/$PROJECT_FILE
-docker cp ./demo_project.sh.tmp $ORACLE_VERSION:/demo_project.sh
-docker exec $ORACLE_VERSION bash demo_project.sh
+docker cp ./${PROJECT_FILE} oracle:/${PROJECT_FILE}
+docker cp ./demo_project.sh.tmp oracle:/demo_project.sh
+docker exec oracle bash /demo_project.sh

.travis/install_utplsql.sh

@@ -4,31 +4,30 @@ cd $(dirname $(readlink -f $0))
 
 # Download the specified version of utPLSQL.
 if [ "$UTPLSQL_VERSION" == "develop" ]
-    then
-        git clone -b develop --single-branch https://github.com/utPLSQL/utPLSQL.git
-        tar -czf $UTPLSQL_FILE.tar.gz $UTPLSQL_FILE && rm -rf $UTPLSQL_FILE
+then
+    git clone -b develop --single-branch https://github.com/utPLSQL/utPLSQL.git
 else
     curl -L -O "https://github.com/utPLSQL/utPLSQL/releases/download/$UTPLSQL_VERSION/$UTPLSQL_FILE.tar.gz"
+    tar -xzf ${UTPLSQL_FILE}.tar.gz && rm ${UTPLSQL_FILE}.tar.gz
 fi
 
+chmod -R go+w ./${UTPLSQL_FILE}/{source,examples}
 # Create a temporary install script.
 cat > install.sh.tmp <<EOF
-tar -xzf ${UTPLSQL_FILE}.tar.gz && rm ${UTPLSQL_FILE}.tar.gz
-cd ${UTPLSQL_FILE}/source
+cd /${UTPLSQL_FILE}/source
 sqlplus -S -L sys/oracle@//127.0.0.1:1521/xe AS SYSDBA @install_headless.sql ut3 ut3 users
 EOF
 
 # Copy utPLSQL files to the container and install it.
-docker cp ./$UTPLSQL_FILE.tar.gz $ORACLE_VERSION:/$UTPLSQL_FILE.tar.gz
+docker cp ./${UTPLSQL_FILE} oracle:/${UTPLSQL_FILE}
 # docker cp ./$UTPLSQL_FILE $ORACLE_VERSION:/$UTPLSQL_FILE
-docker cp ./install.sh.tmp $ORACLE_VERSION:/install.sh
-docker cp ./create_api_user.sh $ORACLE_VERSION:/create_api_user.sh
-
+docker cp ./install.sh.tmp oracle:/install.sh
+docker cp ./create_api_user.sh oracle:/create_api_user.sh
 # Remove temporary files.
 # rm $UTPLSQL_FILE.tar.gz
 rm -rf $UTPLSQL_FILE
 rm install.sh.tmp
 
 # Execute the utPLSQL installation inside the container.
-docker exec $ORACLE_VERSION bash install.sh
-docker exec $ORACLE_VERSION bash create_api_user.sh
+docker exec oracle bash /install.sh
+docker exec oracle bash /create_api_user.sh