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

Merge pull request #124 from cr1901/netbsd

Browse Source 
NetBSD Fixes
This commit is contained in:
Laurent Cozic
2018-06-13 20:13:30 +01:00
committed by GitHub
parent 5e0f3bb09d 487fd112c1
commit ae564afa9c
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rsync_tmbackup.sh
+7
View File
@@ -59,6 +59,7 @@ fn_parse_date() {
case "$OSTYPE" in case "$OSTYPE" in
linux*) date -d "${1:0:10} ${1:11:2}:${1:13:2}:${1:15:2}" +%s ;; linux*) date -d "${1:0:10} ${1:11:2}:${1:13:2}:${1:15:2}" +%s ;;
cygwin*) date -d "${1:0:10} ${1:11:2}:${1:13:2}:${1:15:2}" +%s ;; cygwin*) date -d "${1:0:10} ${1:11:2}:${1:13:2}:${1:15:2}" +%s ;;
netbsd*) date -d "${1:0:10} ${1:11:2}:${1:13:2}:${1:15:2}" +%s ;;
darwin8*) yy=`expr ${1:0:4}` darwin8*) yy=`expr ${1:0:4}`
mm=`expr ${1:5:2} - 1` mm=`expr ${1:5:2} - 1`
dd=`expr ${1:8:2}` dd=`expr ${1:8:2}`
@@ -369,6 +370,12 @@ 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
elif [[ "$OSTYPE" == "netbsd"* ]]; then
RUNNINGPID="$(fn_run_cmd "cat $INPROGRESS_FILE")"
if ps -axp "$RUNNINGPID" -o "command" | grep "$APPNAME" > /dev/null; then
fn_log_error "Previous backup task is still active - aborting."
exit 1
fi
else else
RUNNINGPID="$(fn_run_cmd "cat $INPROGRESS_FILE")" RUNNINGPID="$(fn_run_cmd "cat $INPROGRESS_FILE")"
if [ "$RUNNINGPID" = "$(pgrep -o -f "$APPNAME")" ]; then if [ "$RUNNINGPID" = "$(pgrep -o -f "$APPNAME")" ]; then