From 2a6c82c513dfe08681d401873762af8d40582976 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacek=20G=C4=99bal?= <jgebal@users.noreply.github.com>
Date: Sun, 28 Oct 2018 08:01:14 +0000
Subject: [PATCH] Fix sqlcl download

---
 .travis/download.js      | 4 +++-
 .travis/download.sh      | 7 ++++---
 .travis/install_sqlcl.sh | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.travis/download.js b/.travis/download.js
index bc981cdf4..339001c57 100644
--- a/.travis/download.js
+++ b/.travis/download.js
@@ -17,6 +17,7 @@ var paramUsername = casper.cli.get(0);
 var paramPassword = casper.cli.get(1);
 var agreementUrl  = casper.cli.get(2);
 var downloadUrl   = casper.cli.get(3);
+var downloaded    = false;
 
 casper.start();
 // TODO: Error handling.
@@ -41,10 +42,11 @@ casper.thenOpen(downloadUrl).waitForUrl(/signon\.jsp$/, function (re) {
 });
 
 casper.on("resource.received", function (resource) {
-   if (resource.url.indexOf("AuthParam") !== -1) {
+   if (resource.url.indexOf("AuthParam") !== -1 && !downloaded) {
       // this.echo("DownloadUrl:");
       // Print the download url.
       this.echo(resource.url);
+      downloaded = true;
       // TODO: Try to download file from here. this.download is not working because of cross site request.
    }
 });
diff --git a/.travis/download.sh b/.travis/download.sh
index d7f0b7d0f..fdbcdef7c 100644
--- a/.travis/download.sh
+++ b/.travis/download.sh
@@ -12,8 +12,9 @@ PRODUCT=""
 # Then download the file using curl.
 downloadFile() {
     downloadUrl=$(exec casperjs download.js $ORACLE_OTN_USER $ORACLE_OTN_PASSWORD $1 $2)
+    downloadUrl=${downloadUrl%$'\r'}
     echo "DownloadURL: $downloadUrl"
-    curl $downloadUrl -o $3
+    curl -o $3 -L "$downloadUrl"
 }
 
 #############################
@@ -60,8 +61,8 @@ 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-18.2.0.zip"
-    outputFile=sqlcl-18.2.0.zip
+    downloadUrl="https://download.oracle.com/otn/java/sqldeveloper/sqlcl-18.3.0.259.2029.zip"
+    outputFile=sqlcl-18.3.0.259.2029.zip
     downloadFile $agreementUrl $downloadUrl $outputFile
     exit 0
 fi
diff --git a/.travis/install_sqlcl.sh b/.travis/install_sqlcl.sh
index 9db262c5d..9743ddac2 100644
--- a/.travis/install_sqlcl.sh
+++ b/.travis/install_sqlcl.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-SQLCL_FILE=sqlcl-18.2.0.zip
+SQLCL_FILE=sqlcl-18.3.0.259.2029.zip
 cd .travis
 
 # Download if not present on cache dir.