Moved trailing slash to rsync source directory from .travis.yml to de…

…ploy.sh
opulencephp · Aug 25, 2019 · eb2f398 · eb2f398
1 parent 2c46c84
commit eb2f398
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -34,7 +34,7 @@ script: vendor/bin/phpunit --verbose
 # Purposely leaving trailing slash on the source directory so that the contents get copied
 deploy:
   - provider: script
-    script: bash bin/deploy.sh $TRAVIS_BUILD_DIR/ $TRAVIS_BUILD_NUMBER $SSH_USER $SSH_HOST
+    script: bash bin/deploy.sh $TRAVIS_BUILD_DIR $TRAVIS_BUILD_NUMBER $SSH_USER $SSH_HOST
     on:
       branch: "1.0"
     skip_cleanup: true

diff --git a/bin/deploy.sh b/bin/deploy.sh
@@ -32,7 +32,8 @@ fi
 html_dir=/var/www/html
 target_dir=$html_dir/releases/$BUILD_NUMBER
 echo "rsync'ing to host"
-rsync -aq --delete-after --rsync-path="mkdir -p $target_dir/ && rsync" "$SOURCE_DIR" $SSH_USER@$SSH_HOST:$target_dir/
+# Purposely leaving trailing slash on the source directory so that the contents get copied
+rsync -aq --delete-after --rsync-path="mkdir -p $target_dir/ && rsync" "$SOURCE_DIR/" $SSH_USER@$SSH_HOST:$target_dir/
 
 echo "Creating symlinks and swapping"
 ssh $SSH_USER@$SSH_HOST /bin/bash <<EOF