From 45304c608cbfed308c8f97c1483e0a084669ef5e Mon Sep 17 00:00:00 2001 From: Enrico Da Ros Date: Wed, 4 Nov 2020 12:09:53 +0100 Subject: [PATCH] Support for Qnap without ctime --- dev/debug_osync.sh | 12 +++++++++--- dev/n_osync.sh | 4 ++-- dev/ofunctions.sh | 6 ++++++ 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dev/debug_osync.sh b/dev/debug_osync.sh index 55b6502..7a82acc 100755 --- a/dev/debug_osync.sh +++ b/dev/debug_osync.sh @@ -759,7 +759,7 @@ function _PerfProfiler { #__WITH_PARANOIA_DEBUG perfString=$(ps -p $$ -o args,pid,ppid,%cpu,%mem,time,etime,state,wchan) #__WITH_PARANOIA_DEBUG #__WITH_PARANOIA_DEBUG for i in $(pgrep -P $$); do #__WITH_PARANOIA_DEBUG - perfString="$perfString\n"$(ps -p $i -o args,pid,ppid,%cpu,%mem,time,etime,state,wchan | :| tail -1) #__WITH_PARANOIA_DEBUG + perfString="$perfString\n"$(ps -p $i -o args,pid,ppid,%cpu,%mem,time,etime,state,wchan | tail -1) #__WITH_PARANOIA_DEBUG done #__WITH_PARANOIA_DEBUG #__WITH_PARANOIA_DEBUG if type iostat > /dev/null 2>&1; then #__WITH_PARANOIA_DEBUG @@ -1471,6 +1471,9 @@ function GetLocalOS { *"Android"*) LOCAL_OS="Android" ;; + *"qnap"*) + LOCAL_OS="Qnap" + ;; *"Linux"*) LOCAL_OS="Linux" ;; @@ -1697,6 +1700,9 @@ ENDSSH *"Android"*) REMOTE_OS="Android" ;; + *"qnap"*) + REMOTE_OS="Qnap" + ;; *"Linux"*) REMOTE_OS="Linux" ;; @@ -5297,7 +5303,7 @@ function _SoftDeleteLocal { local retval - if [ "$LOCAL_OS" == "Busybox" ] || [ "$LOCAL_OS" == "Android" ]; then + if [ "$LOCAL_OS" == "Busybox" ] || [ "$LOCAL_OS" == "Android" ] || [ "$LOCAL_OS" == "Qnap" ]; then Logger "Skipping $deletionType deletion on $replicaType. Busybox find -ctime not supported." "NOTICE" return 0 fi @@ -5350,7 +5356,7 @@ function _SoftDeleteRemote { local retval - if [ "$REMOTE_OS" == "BusyBox" ] || [ "$REMOTE_OS" == "Android" ]; then + if [ "$REMOTE_OS" == "BusyBox" ] || [ "$REMOTE_OS" == "Android" ] || [ "$REMOTE_OS" == "Qnap" ]; then Logger "Skipping $deletionType deletion on $replicaType. Busybox find -ctime not supported." "NOTICE" return 0 fi diff --git a/dev/n_osync.sh b/dev/n_osync.sh index 91c4c77..30919f0 100644 --- a/dev/n_osync.sh +++ b/dev/n_osync.sh @@ -2173,7 +2173,7 @@ function _SoftDeleteLocal { local retval - if [ "$LOCAL_OS" == "Busybox" ] || [ "$LOCAL_OS" == "Android" ]; then + if [ "$LOCAL_OS" == "Busybox" ] || [ "$LOCAL_OS" == "Android" ] || [ "$LOCAL_OS" == "Qnap" ]; then Logger "Skipping $deletionType deletion on $replicaType. Busybox find -ctime not supported." "NOTICE" return 0 fi @@ -2226,7 +2226,7 @@ function _SoftDeleteRemote { local retval - if [ "$REMOTE_OS" == "BusyBox" ] || [ "$REMOTE_OS" == "Android" ]; then + if [ "$REMOTE_OS" == "BusyBox" ] || [ "$REMOTE_OS" == "Android" ] || [ "$REMOTE_OS" == "Qnap" ]; then Logger "Skipping $deletionType deletion on $replicaType. Busybox find -ctime not supported." "NOTICE" return 0 fi diff --git a/dev/ofunctions.sh b/dev/ofunctions.sh index 0c458c2..0179116 100644 --- a/dev/ofunctions.sh +++ b/dev/ofunctions.sh @@ -1488,6 +1488,9 @@ function GetLocalOS { *"Android"*) LOCAL_OS="Android" ;; + *"qnap"*) + LOCAL_OS="Qnap" + ;; *"Linux"*) LOCAL_OS="Linux" ;; @@ -1716,6 +1719,9 @@ ENDSSH *"Android"*) REMOTE_OS="Android" ;; + *"qnap"*) + REMOTE_OS="Qnap" + ;; *"Linux"*) REMOTE_OS="Linux" ;;