Changes on download tool.

viniciusam · viniciusam · commit 129afdef1cbd · 2017-03-11T15:56:35.000-03:00
diff --git a/.travis/download.sh b/.travis/download.sh
@@ -8,7 +8,7 @@ PRODUCT=""
 downloadFile() {
     downloadUrl=$(exec casperjs download.js $ORACLE_OTN_USER $ORACLE_OTN_PASSWORD $1 $2)
     echo "DownloadURL: $downloadUrl"
-    curl -O $downloadUrl
+    curl $downloadUrl -o $3
 }
 
 #############################
@@ -24,34 +24,40 @@ done
 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"
-    downloadFile $agreementUrl $downloadUrl
+    outputFile=linuxamd64_12102_database_se2_1of2.zip
+    downloadFile $agreementUrl $downloadUrl $outputFile
     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
+    outputFile=linuxamd64_12102_database_se2_2of2.zip
+    downloadFile $agreementUrl $downloadUrl $outputFile
     exit 0
 fi
 
 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"
-    downloadFile $agreementUrl $downloadUrl
+    outputFile=linuxamd64_12102_database_1of2.zip
+    downloadFile $agreementUrl $downloadUrl $outputFile
     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"
-    downloadFile $agreementUrl $downloadUrl
+    outputFile=linuxamd64_12102_database_2of2.zip
+    downloadFile $agreementUrl $downloadUrl $outputFile
     exit 0
 fi
 
 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"
-    downloadFile $agreementUrl $downloadUrl
+    outputFile=oracle-xe-11.2.0-1.0.x86_64.rpm.zip
+    downloadFile $agreementUrl $downloadUrl $outputFile
     exit 0
 fi
 
 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"
-    downloadFile $agreementUrl $downloadUrl
+    outputFile=sqlcl-4.2.0.16.355.0402-no-jre.zip
+    downloadFile $agreementUrl $downloadUrl $outputFile
     exit 0
 fi
 
diff --git a/.travis/download_sqlcl.sh b/.travis/download_sqlcl.sh
@@ -4,7 +4,6 @@ set -e
 cd .travis
 if [ ! -d $HOME/.cache/sqlcl ]; then
     sh download.sh -p sqlcl
-    ls -la
     unzip -q sqlcl-4.2.0.16.355.0402-no-jre.zip
     rm -f sqlcl-4.2.0.16.355.0402-no-jre.zip
     bash mv sqlcl $HOME/.cache/
