From 56cb14e30c785a60bd4fcd96b602c738b51eb947 Mon Sep 17 00:00:00 2001
From: Alexey Andreev <konsoletyper@gmail.com>
Date: Wed, 3 Apr 2019 12:04:48 +0300
Subject: [PATCH] Update deploy scripts

---
 .travis.yml     | 2 +-
 upload-files.sh | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8c09a879a..e7904ec5f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -65,7 +65,7 @@ after_success: >
      export NEW_VERSION
      export FTP_HOST
      export FTP_PORT
-     export FTP_LOGIN
+     export FTP_USER
      export FTP_PATH
      export SSH_KEY
      mv -f $HOME/built_artifacts_backup $HOME/mvn_repo/org/teavm
diff --git a/upload-files.sh b/upload-files.sh
index 5583a8f7c..0480df4c7 100755
--- a/upload-files.sh
+++ b/upload-files.sh
@@ -2,13 +2,12 @@
 
 echo "${SSH_KEY}" | base64 --decode >/tmp/sftp_rsa
 chmod 0700 /tmp/sftp_rsa
-SCP="scp -o StrictHostKeyChecking=no -i /tmp/sftp_rsa -B -r -P $FTP_PORT"
 SCP_TARGET="$FTP_USER@$FTP_HOST:~/$FTP_PATH"
 
 #
 # Upload CLI
 #
-$SCP tools/cli/target/teavm-cli-$NEW_VERSION.jar $SCP_TARGET/cli/dev/
+scp -o StrictHostKeyChecking=no -i /tmp/sftp_rsa -B -r -P $FTP_PORT tools/cli/target/teavm-cli-$NEW_VERSION.jar $SCP_TARGET/cli/dev/
 
 #
 # Update IDEA repository descriptor
@@ -23,7 +22,7 @@ cat <<EOF >.idea-repository.xml
 </plugins>
 EOF
 
-$SCP .idea-repository.xml $SCP_TARGET/idea/dev/teavmRepository.xml
+scp -o StrictHostKeyChecking=no -i /tmp/sftp_rsa -B -r -P $FTP_PORT .idea-repository.xml $SCP_TARGET/idea/dev/teavmRepository.xml
 
 #
 # Upload Eclipse plugin