Changing sudo to required and adding validations.

viniciusam · viniciusam · commit 819fb7dc774c · 2017-03-16T08:54:53.000-03:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
-sudo: false
+sudo: required
 language: python
 
 addons:
diff --git a/.travis/download.sh b/.travis/download.sh
@@ -1,6 +1,11 @@
 #!/bin/bash
 set -e
 
+if [ "$ORACLE_OTN_USER" == "" ] || [ "$ORACLE_OTN_PASSWORD" == "" ]; then
+    echo "Error: Oracle OTN username/password not specified."
+    exit 1
+fi
+
 PRODUCT=""
 
 # Call the casperjs script to return the download url.
@@ -21,7 +26,7 @@ while getopts "p:" OPTNAME; do
     esac
 done
 
-if [ "$PRODUCT" = "se12c" ]; then
+if [ "$PRODUCT" == "se12c" ]; then
     agreementUrl="http://www.oracle.com/technetwork/database/enterprise-edition/downloads/index.html"
     downloadUrl="http://download.oracle.com/otn/linux/oracle12c/121020/linuxamd64_12102_database_se2_1of2.zip"
     outputFile=linuxamd64_12102_database_se2_1of2.zip
@@ -33,7 +38,7 @@ if [ "$PRODUCT" = "se12c" ]; then
     exit 0
 fi
 
-if [ "$PRODUCT" = "ee12c" ]; then
+if [ "$PRODUCT" == "ee12c" ]; then
     agreementUrl="http://www.oracle.com/technetwork/database/enterprise-edition/downloads/index.html"
     downloadUrl="http://download.oracle.com/otn/linux/oracle12c/121020/linuxamd64_12102_database_1of2.zip"
     outputFile=linuxamd64_12102_database_1of2.zip
@@ -45,21 +50,21 @@ if [ "$PRODUCT" = "ee12c" ]; then
     exit 0
 fi
 
-if [ "$PRODUCT" = "xe11g" ]; then
+if [ "$PRODUCT" == "xe11g" ]; then
     agreementUrl="http://www.oracle.com/technetwork/database/database-technologies/express-edition/downloads/index.html"
     downloadUrl="https://edelivery.oracle.com/akam/otn/linux/oracle11g/xe/oracle-xe-11.2.0-1.0.x86_64.rpm.zip"
     outputFile=oracle-xe-11.2.0-1.0.x86_64.rpm.zip
     downloadFile $agreementUrl $downloadUrl $outputFile
     exit 0
 fi
 
-if [ "$PRODUCT" = "sqlcl" ]; then
+if [ "$PRODUCT" == "sqlcl" ]; then
     agreementUrl="http://www.oracle.com/technetwork/developer-tools/sqlcl/downloads/index.html"
     downloadUrl="http://download.oracle.com/otn/java/sqldeveloper/sqlcl-4.2.0.16.355.0402-no-jre.zip"
     outputFile=sqlcl-4.2.0.16.355.0402-no-jre.zip
     downloadFile $agreementUrl $downloadUrl $outputFile
     exit 0
 fi
 
-echo "Invalid product: $PRODUCT"
+echo "Error: invalid product: $PRODUCT"
 exit 1

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-sudo: false`
	`1`	`+sudo: required`
`2`	`2`	`language: python`
`3`	`3`
`4`	`4`	`addons:`