WMDE
/
osync
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support for Qnap without ctime

This commit is contained in:
Enrico Da Ros 2020-11-04 12:09:53 +01:00
parent 8451024ae2
commit 45304c608c
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dev/debug_osync.sh
View File

@ -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 perfString=$(ps -p $$ -o args,pid,ppid,%cpu,%mem,time,etime,state,wchan) #__WITH_PARANOIA_DEBUG
#__WITH_PARANOIA_DEBUG #__WITH_PARANOIA_DEBUG
for i in $(pgrep -P $$); do #__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 done #__WITH_PARANOIA_DEBUG
#__WITH_PARANOIA_DEBUG #__WITH_PARANOIA_DEBUG
if type iostat > /dev/null 2>&1; then #__WITH_PARANOIA_DEBUG if type iostat > /dev/null 2>&1; then #__WITH_PARANOIA_DEBUG
@ -1471,6 +1471,9 @@ function GetLocalOS {
*"Android"*) *"Android"*)
LOCAL_OS="Android" LOCAL_OS="Android"
;; ;;
*"qnap"*)
LOCAL_OS="Qnap"
;;
*"Linux"*) *"Linux"*)
LOCAL_OS="Linux" LOCAL_OS="Linux"
;; ;;
@ -1697,6 +1700,9 @@ ENDSSH
*"Android"*) *"Android"*)
REMOTE_OS="Android" REMOTE_OS="Android"
;; ;;
*"qnap"*)
REMOTE_OS="Qnap"
;;
*"Linux"*) *"Linux"*)
REMOTE_OS="Linux" REMOTE_OS="Linux"
;; ;;
@ -5297,7 +5303,7 @@ function _SoftDeleteLocal {
local retval 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" Logger "Skipping $deletionType deletion on $replicaType. Busybox find -ctime not supported." "NOTICE"
return 0 return 0
fi fi
@ -5350,7 +5356,7 @@ function _SoftDeleteRemote {
local retval 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" Logger "Skipping $deletionType deletion on $replicaType. Busybox find -ctime not supported." "NOTICE"
return 0 return 0
fi fi

4
dev/n_osync.sh
View File

@ -2173,7 +2173,7 @@ function _SoftDeleteLocal {
local retval 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" Logger "Skipping $deletionType deletion on $replicaType. Busybox find -ctime not supported." "NOTICE"
return 0 return 0
fi fi
@ -2226,7 +2226,7 @@ function _SoftDeleteRemote {
local retval 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" Logger "Skipping $deletionType deletion on $replicaType. Busybox find -ctime not supported." "NOTICE"
return 0 return 0
fi fi

6
dev/ofunctions.sh
View File

@ -1488,6 +1488,9 @@ function GetLocalOS {
*"Android"*) *"Android"*)
LOCAL_OS="Android" LOCAL_OS="Android"
;; ;;
*"qnap"*)
LOCAL_OS="Qnap"
;;
*"Linux"*) *"Linux"*)
LOCAL_OS="Linux" LOCAL_OS="Linux"
;; ;;
@ -1716,6 +1719,9 @@ ENDSSH
*"Android"*) *"Android"*)
REMOTE_OS="Android" REMOTE_OS="Android"
;; ;;
*"qnap"*)
REMOTE_OS="Qnap"
;;
*"Linux"*) *"Linux"*)
REMOTE_OS="Linux" REMOTE_OS="Linux"
;; ;;