From 4fa7bf9d9204dd0f948d78e0f59affef2feed19a Mon Sep 17 00:00:00 2001
From: Pat Marion <james.patrick.marion@gmail.com>
Date: Sat, 29 Jun 2019 21:47:03 -0400
Subject: [PATCH] update and use copy_files.sh

---
 distro/travis/copy_files.sh           |  10 +++++-----
 distro/travis/director_upload_key.enc | Bin 0 -> 1840 bytes
 distro/travis/docs_and_package.sh     |   6 +++---
 distro/travis/test_docker.sh          |   1 +
 distro/travis/ubuntu14.dockerfile     |   2 ++
 distro/travis/ubuntu16.dockerfile     |   2 ++
 distro/travis/ubuntu18.dockerfile     |   2 ++
 7 files changed, 15 insertions(+), 8 deletions(-)
 create mode 100644 distro/travis/director_upload_key.enc

diff --git a/distro/travis/copy_files.sh b/distro/travis/copy_files.sh
index 653a36dbf..77cb99691 100755
--- a/distro/travis/copy_files.sh
+++ b/distro/travis/copy_files.sh
@@ -4,17 +4,17 @@ set -e
 
 scriptDir=$(cd $(dirname $0) && pwd)
 
-if [ -z "$encrypted_444f3458e047_key" ]; then
+if [ -z "$encrypted_copyfiles_password" ]; then
   echo "encrypted ssh keys not available. ignoring request to copy files:" $*
   exit 0
 fi
 
-openssl aes-256-cbc -K $encrypted_444f3458e047_key -iv $encrypted_444f3458e047_iv -in $scriptDir/travisci.key.enc -out $scriptDir/travisci.key -d
-chmod 600 $scriptDir/travisci.key
+openssl aes-256-cbc -k $encrypted_copyfiles_password -in $scriptDir/director_upload_key.enc -out $scriptDir/director_upload_key -d
+chmod 600 $scriptDir/director_upload_key
 
 dest=$encrypted_copyfiles_host
-user=travis
+user=pat
 
 mkdir -p ~/.ssh
 ssh-keyscan -H $dest >> ~/.ssh/known_hosts
-scp -i $scriptDir/travisci.key $* $user@$dest:files/
+scp -i $scriptDir/director_upload_key $* $user@$dest:director_upload_files/
diff --git a/distro/travis/director_upload_key.enc b/distro/travis/director_upload_key.enc
new file mode 100644
index 0000000000000000000000000000000000000000..2f14255d925a2ea26e548fbc1a9b684d54b8e546
GIT binary patch
literal 1840
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

literal 0
HcmV?d00001

diff --git a/distro/travis/docs_and_package.sh b/distro/travis/docs_and_package.sh
index 9ee990109..379989e26 100755
--- a/distro/travis/docs_and_package.sh
+++ b/distro/travis/docs_and_package.sh
@@ -22,21 +22,21 @@ make_docs()
   tar -czf doxygen_docs.tar.gz doxygen_docs
   tar -czf python_coverage.tar.gz python_coverage
 
-  $scriptDir/bintray_upload.sh $verionString $TRAVIS_BUILD_DIR/docs/*.tar.gz
+  $scriptDir/copy_files.sh $TRAVIS_BUILD_DIR/docs/*.tar.gz
 }
 
 make_linux_package()
 {
   cd $TRAVIS_BUILD_DIR/distro/package
   ./make_linux_package.sh 2>&1 > log.txt || cat log.txt
-  $scriptDir/bintray_upload.sh $versionString $TRAVIS_BUILD_DIR/distro/package/*.tar.gz
+  $scriptDir/copy_files.sh $TRAVIS_BUILD_DIR/distro/package/*.tar.gz
 }
 
 make_mac_package()
 {
   cd $TRAVIS_BUILD_DIR/distro/package
   ./make_mac_package.sh 2>&1 > log.txt || cat log.txt
-  $scriptDir/bintray_upload.sh $versionString $TRAVIS_BUILD_DIR/distro/package/*.tar.gz
+  $scriptDir/copy_files.sh $TRAVIS_BUILD_DIR/distro/package/*.tar.gz
 }
 
 make_package()
diff --git a/distro/travis/test_docker.sh b/distro/travis/test_docker.sh
index 07d80699b..ae8a884c9 100755
--- a/distro/travis/test_docker.sh
+++ b/distro/travis/test_docker.sh
@@ -33,5 +33,6 @@ docker build -f $root_dir/distro/travis/ubuntu${UBUNTU_TEST_VERSION}.dockerfile
   --build-arg encrypted_444f3458e047_key="$encrypted_444f3458e047_key" \
   --build-arg encrypted_444f3458e047_iv="$encrypted_444f3458e047_iv" \
   --build-arg encrypted_copyfiles_host="$encrypted_copyfiles_host" \
+  --build-arg encrypted_copyfiles_password="$encrypted_copyfiles_password" \
   --build-arg encrypted_bintray_api_key="$encrypted_bintray_api_key" \
   $root_dir
diff --git a/distro/travis/ubuntu14.dockerfile b/distro/travis/ubuntu14.dockerfile
index ea717eb43..3dbbc72fa 100644
--- a/distro/travis/ubuntu14.dockerfile
+++ b/distro/travis/ubuntu14.dockerfile
@@ -15,6 +15,7 @@ ARG TRAVIS_BUILD_DIR
 ARG encrypted_444f3458e047_key
 ARG encrypted_444f3458e047_iv
 ARG encrypted_copyfiles_host
+ARG encrypted_copyfiles_password
 ARG encrypted_bintray_api_key
 
 ENV \
@@ -34,6 +35,7 @@ ENV \
     encrypted_444f3458e047_key="${encrypted_444f3458e047_key}" \
     encrypted_444f3458e047_iv="${encrypted_444f3458e047_iv}" \
     encrypted_copyfiles_host="${encrypted_copyfiles_host}" \
+    encrypted_copyfiles_password="${encrypted_copyfiles_password}" \
     encrypted_bintray_api_key="${encrypted_bintray_api_key}"
 
 
diff --git a/distro/travis/ubuntu16.dockerfile b/distro/travis/ubuntu16.dockerfile
index 045455e61..d178a260e 100644
--- a/distro/travis/ubuntu16.dockerfile
+++ b/distro/travis/ubuntu16.dockerfile
@@ -15,6 +15,7 @@ ARG TRAVIS_BUILD_DIR
 ARG encrypted_444f3458e047_key
 ARG encrypted_444f3458e047_iv
 ARG encrypted_copyfiles_host
+ARG encrypted_copyfiles_password
 ARG encrypted_bintray_api_key
 
 ENV \
@@ -34,6 +35,7 @@ ENV \
     encrypted_444f3458e047_key="${encrypted_444f3458e047_key}" \
     encrypted_444f3458e047_iv="${encrypted_444f3458e047_iv}" \
     encrypted_copyfiles_host="${encrypted_copyfiles_host}" \
+    encrypted_copyfiles_password="${encrypted_copyfiles_password}" \
     encrypted_bintray_api_key="${encrypted_bintray_api_key}"
 
 
diff --git a/distro/travis/ubuntu18.dockerfile b/distro/travis/ubuntu18.dockerfile
index b4d4dc187..0fc203924 100644
--- a/distro/travis/ubuntu18.dockerfile
+++ b/distro/travis/ubuntu18.dockerfile
@@ -15,6 +15,7 @@ ARG TRAVIS_BUILD_DIR
 ARG encrypted_444f3458e047_key
 ARG encrypted_444f3458e047_iv
 ARG encrypted_copyfiles_host
+ARG encrypted_copyfiles_password
 ARG encrypted_bintray_api_key
 
 ENV \
@@ -34,6 +35,7 @@ ENV \
     encrypted_444f3458e047_key="${encrypted_444f3458e047_key}" \
     encrypted_444f3458e047_iv="${encrypted_444f3458e047_iv}" \
     encrypted_copyfiles_host="${encrypted_copyfiles_host}" \
+    encrypted_copyfiles_password="${encrypted_copyfiles_password}" \
     encrypted_bintray_api_key="${encrypted_bintray_api_key}"