schiwagoa/rsync-time-backup
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes for ssh source folder /

Browse Source
This commit is contained in:
markalston
2017-09-20 10:40:34 -06:00
committed by GitHub
parent 6b05dca48a
commit 13357c1cc9
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rsync_tmbackup.sh
+9 -7
View File
@@ -10,7 +10,7 @@ fn_log_info() { echo "$APPNAME: $1"; }
fn_log_warn() { echo "$APPNAME: [WARNING] $1" 1>&2; } fn_log_warn() { echo "$APPNAME: [WARNING] $1" 1>&2; }
fn_log_error() { echo "$APPNAME: [ERROR] $1" 1>&2; } fn_log_error() { echo "$APPNAME: [ERROR] $1" 1>&2; }
fn_log_info_cmd() { fn_log_info_cmd() {
if [ -n "$SSH_CMD" ]; then if [ -n "$SSH_DEST_FOLDER_PREFIX" ]; then
echo "$APPNAME: $SSH_CMD '$1'"; echo "$APPNAME: $SSH_CMD '$1'";
else else
echo "$APPNAME: $1"; echo "$APPNAME: $1";
@@ -83,7 +83,6 @@ fn_parse_ssh() {
SSH_DEST_FOLDER=$(echo "$DEST_FOLDER" | sed -E 's/^([A-Za-z0-9\._%\+\-]+)@([A-Za-z0-9.\-]+)\:(.+)$/\3/') SSH_DEST_FOLDER=$(echo "$DEST_FOLDER" | sed -E 's/^([A-Za-z0-9\._%\+\-]+)@([A-Za-z0-9.\-]+)\:(.+)$/\3/')
SSH_CMD="ssh -p $SSH_PORT ${SSH_USER}@${SSH_HOST}" SSH_CMD="ssh -p $SSH_PORT ${SSH_USER}@${SSH_HOST}"
SSH_DEST_FOLDER_PREFIX="${SSH_USER}@${SSH_HOST}:" SSH_DEST_FOLDER_PREFIX="${SSH_USER}@${SSH_HOST}:"
elif [[ "$SRC_FOLDER" =~ ^[A-Za-z0-9\._%\+\-]+@[A-Za-z0-9.\-]+\:.+$ ]] elif [[ "$SRC_FOLDER" =~ ^[A-Za-z0-9\._%\+\-]+@[A-Za-z0-9.\-]+\:.+$ ]]
then then
SSH_USER=$(echo "$SRC_FOLDER" | sed -E 's/^([A-Za-z0-9\._%\+\-]+)@([A-Za-z0-9.\-]+)\:(.+)$/\1/') SSH_USER=$(echo "$SRC_FOLDER" | sed -E 's/^([A-Za-z0-9\._%\+\-]+)@([A-Za-z0-9.\-]+)\:(.+)$/\1/')
@@ -95,7 +94,7 @@ fn_parse_ssh() {
} }
fn_run_cmd() { fn_run_cmd() {
if [ -n "$SSH_CMD" ] if [ -n "$SSH_DEST_FOLDER_PREFIX" ]
then then
eval "$SSH_CMD '$1'" eval "$SSH_CMD '$1'"
else else
@@ -205,13 +204,13 @@ if [[ -z "$SRC_FOLDER" || -z "$DEST_FOLDER" ]]; then
exit 1 exit 1
fi fi
# Strips off last slash. Note that it means the root folder "/" # Strips off last slash from dest. Note that it means the root folder "/"
# will be represented as an empty string "", which is fine # will be represented as an empty string "", which is fine
# with the current script (since a "/" is added when needed) # with the current script (since a "/" is added when needed)
# but still something to keep in mind. # but still something to keep in mind.
# Don't think it would with DEST_FOLDER set to "/" though, # However, due to this behavior we delay stripping the last slash for
# but there's probably not a use case for this anyway. # the source folder until after parsing for ssh usage.
SRC_FOLDER="${SRC_FOLDER%/}"
DEST_FOLDER="${DEST_FOLDER%/}" DEST_FOLDER="${DEST_FOLDER%/}"
fn_parse_ssh fn_parse_ssh
@@ -224,6 +223,9 @@ if [ -n "$SSH_SRC_FOLDER" ]; then
SRC_FOLDER="$SSH_SRC_FOLDER" SRC_FOLDER="$SSH_SRC_FOLDER"
fi fi
# Now strip off last slash from source folder.
SRC_FOLDER="${SRC_FOLDER%/}"
for ARG in "$SRC_FOLDER" "$DEST_FOLDER" "$EXCLUSION_FILE"; do for ARG in "$SRC_FOLDER" "$DEST_FOLDER" "$EXCLUSION_FILE"; do
if [[ "$ARG" == *"'"* ]]; then if [[ "$ARG" == *"'"* ]]; then
fn_log_error 'Source and destination directories may not contain single quote characters.' fn_log_error 'Source and destination directories may not contain single quote characters.'