Changes on download tool.

viniciusam · viniciusam · commit b82b584b3a3e · 2017-03-11T15:28:28.000-03:00
diff --git a/.travis/download.sh b/.travis/download.sh
@@ -1,16 +1,13 @@
 #!/bin/bash
 
 PRODUCT=""
-AGREEMENT_URL=""
-DOWNLOAD_URL=""
-OUTPUT_FILE=""
 
 # Call the casperjs script to return the download url.
 # Then download the file using curl.
 downloadFile() {
-    downloadUrl=$(exec casperjs download.js $ORACLE_OTN_USER $ORACLE_OTN_PASSWORD $AGREEMENT_URL $DOWNLOAD_URL)
-    #echo "DownloadURL: $downloadUrl"
-    curl $downloadUrl -o $OUTPUT_FILE
+    downloadUrl=$(exec casperjs download.js $ORACLE_OTN_USER $ORACLE_OTN_PASSWORD $1 $2)
+    echo "DownloadURL: $downloadUrl"
+    curl -O $downloadUrl
 }
 
 #############################
@@ -24,42 +21,36 @@ while getopts "p:" OPTNAME; do
 done
 
 if [ "$PRODUCT" = "se12c" ]; then
-    AGREEMENT_URL="http://www.oracle.com/technetwork/database/enterprise-edition/downloads/index.html"
-    DOWNLOAD_URL="http://download.oracle.com/otn/linux/oracle12c/121020/linuxamd64_12102_database_se2_1of2.zip"
-    OUTPUT_FILE="linuxamd64_12102_database_se2_1of2.zip"
-    downloadFile
-    AGREEMENT_URL="http://www.oracle.com/technetwork/database/enterprise-edition/downloads/index.html"
-    DOWNLOAD_URL="http://download.oracle.com/otn/linux/oracle12c/121020/linuxamd64_12102_database_se2_2of2.zip"
-    OUTPUT_FILE="linuxamd64_12102_database_se2_2of2.zip"
-    downloadFile
+    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"
+    downloadFile $agreementUrl $downloadUrl
+    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_2of2.zip"
+    downloadFile $agreementUrl $downloadUrl
     exit 0
 fi
 
 if [ "$PRODUCT" = "ee12c" ]; then
-    AGREEMENT_URL="http://www.oracle.com/technetwork/database/enterprise-edition/downloads/index.html"
-    DOWNLOAD_URL="http://download.oracle.com/otn/linux/oracle12c/121020/linuxamd64_12102_database_1of2.zip"
-    OUTPUT_FILE="linuxamd64_12102_database_1of2.zip"
-    downloadFile
-    AGREEMENT_URL="http://www.oracle.com/technetwork/database/enterprise-edition/downloads/index.html"
+    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"
+    downloadFile $agreementUrl $downloadUrl
+    agreementUrl="http://www.oracle.com/technetwork/database/enterprise-edition/downloads/index.html"
     DOWNLOAD_URL="http://download.oracle.com/otn/linux/oracle12c/121020/linuxamd64_12102_database_2of2.zip"
-    OUTPUT_FILE="linuxamd64_12102_database_2of2.zip"
-    downloadFile
+    downloadFile $agreementUrl $downloadUrl
     exit 0
 fi
 
 if [ "$PRODUCT" = "xe11g" ]; then
-    AGREEMENT_URL="http://www.oracle.com/technetwork/database/database-technologies/express-edition/downloads/index.html"
-    DOWNLOAD_URL="https://edelivery.oracle.com/akam/otn/linux/oracle11g/xe/oracle-xe-11.2.0-1.0.x86_64.rpm.zip"
-    OUTPUT_FILE="oracle-xe-11.2.0-1.0.x86_64.rpm.zip"
-    downloadFile
+    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"
+    downloadFile $agreementUrl $downloadUrl
     exit 0
 fi
 
 if [ "$PRODUCT" = "sqlcl" ]; then
-    AGREEMENT_URL="http://www.oracle.com/technetwork/developer-tools/sqlcl/downloads/index.html"
-    DOWNLOAD_URL="http://download.oracle.com/otn/java/sqldeveloper/sqlcl-4.2.0.16.355.0402-no-jre.zip"
-    OUTPUT_FILE="sqlcl-4.2.0.16.355.0402-no-jre.zip"
-    downloadFile
+    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"
+    downloadFile $agreementUrl $downloadUrl
     exit 0
 fi
 
