Changed env.sh to template.env.sh. template.env.sh is read-only - so developers don't change it by accident. Changed directory name to utPLSQL_latest_release in travis to match the template.env.sh and updated .gitignore to prevent env.sh and utPLSQL_latest_release from getting committed.

jgebal · jgebal · commit 3fddfbddb92b · 2017-08-26T09:34:29.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,6 @@ release/
 *.gz
 *.zip
 node_modules/
-utPLSQL/
+utPLSQL_latest_release/
 utPLSQL-cli/
-
+development/env.sh
diff --git a/.travis.yml b/.travis.yml
@@ -45,7 +45,7 @@ env:
     - UT3_DOCKER_REPO="utplsqlv3/oracledb"
     - DOCKHER_HUB_REPO="${DOCKER_BASE_TAG:-$UT3_DOCKER_REPO}"
     #utPLSQL released version directory
-    - UTPLSQL_DIR="utPLSQL"
+    - UTPLSQL_DIR="utPLSQL_latest_release"
   matrix:
     - ORACLE_VERSION="${DOCKER_TAG_11G:-11g-r2-xe}"  CONNECTION_STR='127.0.0.1:1521/XE'       DOCKER_OPTIONS='--shm-size=1g'
     - ORACLE_VERSION="${DOCKER_TAG_12C:-12c-r1-se2}" CONNECTION_STR='127.0.0.1:1521/ORCLPDB1' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs"
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -76,7 +76,7 @@ unzip utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli && rm utPLSQL-cli.zip
 
 ```
 
-Now adjust the file ``development/env.sh`` to match your local needs.
+Now copy the file `development/template.env.sh` to `development/env.sh` and adjust variables to match your local needs.
 You might have to adjust the following lines:
 
 ````bash
diff --git a/development/template.env.sh b/development/template.env.sh
@@ -1,5 +1,12 @@
 #!/usr/bin/env bash
 
+export UTPLSQL_DIR="utPLSQL_latest_release"
+export SQLCLI=sql # For sqlcl client
+#export SQLCLI=sqlplus # For sqlplus client
+export CONNECTION_STR=127.0.0.1:1521/xe # Adjust the connect string
+export ORACLE_PWD=oracle # Adjust your local SYS password
+
+
 export UT3_OWNER=ut3
 export UT3_OWNER_PASSWORD=ut3
 export UT3_RELEASE_VERSION_SCHEMA=ut3_latest_release
@@ -8,9 +15,4 @@ export UT3_TESTER_PASSWORD=ut3
 export UT3_TABLESPACE=users
 export UT3_USER="UT3\$USER#"
 export UT3_USER_PASSWORD=ut3
-export UTPLSQL_DIR="utPLSQL_latest_release"
-export SQLCLI=sql # For sqlcl client
-#export SQLCLI=sqlplus # For sqlplus client
-export CONNECTION_STR=127.0.0.1:1521/xe # Adjust the connect string
-export ORACLE_PWD=oracle # Adjust your local SYS password
 
