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

Merge pull request #109 from NathanFrench/master

Browse Source 
Fix to assure only one instance is running.
This commit is contained in:
Laurent Cozic
2018-02-12 12:38:49 +01:00
committed by GitHub
parent c313e0a322 bfa1fd092e
commit 5aac62cfc0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rsync_tmbackup.sh
+3 -3
View File
@@ -103,7 +103,7 @@ fn_parse_ssh() {
} }
fn_run_cmd() { fn_run_cmd() {
if [ -n "$SSH_DEST_FOLDER_PREFIX" ] if [ -n "$SSH_DEST_FOLDER_PREFIX" ]
then then
eval "$SSH_CMD '$1'" eval "$SSH_CMD '$1'"
else else
@@ -305,9 +305,9 @@ if [ -n "$(fn_find "$INPROGRESS_FILE")" ]; then
fn_log_error "Previous backup task is still active - aborting (command: $RUNNINGCMD)." fn_log_error "Previous backup task is still active - aborting (command: $RUNNINGCMD)."
exit 1 exit 1
fi fi
else else
RUNNINGPID="$(fn_run_cmd "cat $INPROGRESS_FILE")" RUNNINGPID="$(fn_run_cmd "cat $INPROGRESS_FILE")"
if [ "$RUNNINGPID" = "$(pgrep "$APPNAME")" ]; then if [ "$RUNNINGPID" = "$(pgrep -o -f "$APPNAME")" ]; then
fn_log_error "Previous backup task is still active - aborting." fn_log_error "Previous backup task is still active - aborting."
exit 1 exit 1
fi fi