From ad51c532e34f29259b5ae75ddecc55ac68f253f7 Mon Sep 17 00:00:00 2001 From: squaresun <5quar3sun@gmail.com> Date: Mon, 5 Mar 2018 10:07:13 +0800 Subject: [PATCH] Rename to CLEAN_DIR and readme update --- README.md | 1 + upload.sh | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8bcc8e3..3bdc8a6 100644 --- a/README.md +++ b/README.md @@ -47,6 +47,7 @@ pipeline: secure: true (default) | false # true = use FTP(S), false = FTP without SSL verify: true (default) | false # true = strong SSL verification, false = supress SSL verification error chmod: true (default) | false # true = chmod after file transferred, false = no chmod after file transferred + clean_dir: true | false (default) # true = clean destination directory before transferring files, false = don't clean dest_dir: /var/www/mysite src_dir: /mysite/static exclude: diff --git a/upload.sh b/upload.sh index a256208..f7d1df3 100755 --- a/upload.sh +++ b/upload.sh @@ -44,10 +44,10 @@ for i in "${in_arr[@]}"; do PLUGIN_INCLUDE_STR="$PLUGIN_INCLUDE_STR -i $i" done -if [ "$PLUGIN_DELETE_DIR" = true ]; then - PLUGIN_DELETE_DIR="rm -r $PLUGIN_DEST_DIR" +if [ "$PLUGIN_CLEAN_DIR" = true ]; then + PLUGIN_CLEAN_DIR="rm -r $PLUGIN_DEST_DIR" else - PLUGIN_DELETE_DIR="" + PLUGIN_CLEAN_DIR="" fi lftp -e "set xfer:log 1; \ @@ -56,6 +56,6 @@ lftp -e "set xfer:log 1; \ set ftp:ssl-protect-data $PLUGIN_SECURE; \ set ssl:verify-certificate $PLUGIN_VERIFY; \ set ssl:check-hostname $PLUGIN_VERIFY; \ - $PLUGIN_DELETE_DIR; \ + $PLUGIN_CLEAN_DIR; \ mirror --verbose $PLUGIN_CHMOD -R $PLUGIN_INCLUDE_STR $PLUGIN_EXCLUDE_STR $(pwd)$PLUGIN_SRC_DIR $PLUGIN_DEST_DIR" \ -u $FTP_USERNAME,$FTP_PASSWORD $PLUGIN_HOSTNAME