summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorRJ Skerry-Ryan <rryan@mixxx.org>2020-07-20 12:47:11 -0700
committerRJ Skerry-Ryan <rryan@mixxx.org>2020-07-20 12:47:11 -0700
commite716cd37e012b126e19cb40b68abadd3b46b3616 (patch)
tree5396d6d9c89f9242f29d5d72ad634746d21cef20 /build
parent9226812ccb63d6d65aae5a25013d8647c3d6863d (diff)
Remove PR check and address some CodeFactor Bash warnings.
Diffstat (limited to 'build')
-rwxr-xr-xbuild/travis/deploy.sh10
1 files changed, 2 insertions, 8 deletions
diff --git a/build/travis/deploy.sh b/build/travis/deploy.sh
index 2743a4fc53..2ed0b36b87 100755
--- a/build/travis/deploy.sh
+++ b/build/travis/deploy.sh
@@ -10,16 +10,10 @@ HOSTNAME=downloads-hostgator.mixxx.org
TRAVIS_DESTDIR=public_html/downloads/builds/travis
SSH_KEY=../build/certificates/downloads-hostgator.mixxx.org.key
SSH="ssh -i ${SSH_KEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
-
-if [[ "${TRAVIS_PULL_REQUEST}" != "false" ]]; then
- echo "Skipping deploy since we are in a pull request."
- exit 0
-fi
-
DEST_PATH=${TRAVIS_DESTDIR}/${TRAVIS_BRANCH}/
TMP_PATH=${TRAVIS_DESTDIR}/.tmp/$TRAVIS_BUILD_ID/
-echo Deploying to $TMP_PATH, then to $DEST_PATH.
+echo "Deploying to $TMP_PATH, then to $DEST_PATH."
# Remove permissions for group and other users so that ssh-keygen does not
# complain about the key not being protected.
@@ -30,7 +24,7 @@ ssh-keygen -p -P ${DOWNLOADS_HOSTGATOR_DOT_MIXXX_DOT_ORG_KEY_PASSWORD} -N "" -f
# Always upload to a temporary path.
shopt -s extglob
-rsync -e "${SSH}" --rsync-path="mkdir -p ${TMP_PATH} && rsync" -r --delete-after --quiet *.@(deb|dmg) ${USER}@${HOSTNAME}:${TMP_PATH}
+rsync -e "${SSH}" --rsync-path="mkdir -p ${TMP_PATH} && rsync" -r --delete-after --quiet ./*.@(deb|dmg) ${USER}@${HOSTNAME}:${TMP_PATH}
# Move from the temporary path to the final destination.
$SSH ${USER}@${HOSTNAME} "mkdir -p ${DEST_PATH} && mv ${TMP_PATH}/* ${DEST_PATH} && rmdir ${TMP_PATH}"