Use /usr/bin/rm also on Synology, add wrapper for /usr/bin/rm for deleting files in read-only directories
This commit is contained in:
parent
e68fed9277
commit
3fae0fa63a
|
@ -241,7 +241,7 @@ desktop_notify() {
|
||||||
urgency="normal"
|
urgency="normal"
|
||||||
;;
|
;;
|
||||||
"SUCCESS")
|
"SUCCESS")
|
||||||
icon="task-complete.png"
|
icon="dialog-ok.png"
|
||||||
urgency="low"
|
urgency="low"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
|
|
@ -175,7 +175,7 @@ if [[ $MODE == "install" ]]; then
|
||||||
$CP ./server/bkp/etc/* "$BKP_DIR"/etc/
|
$CP ./server/bkp/etc/* "$BKP_DIR"/etc/
|
||||||
# Correct command paths in rsnapshot config for Synology DSM
|
# Correct command paths in rsnapshot config for Synology DSM
|
||||||
if [[ "$DISTRIBUTION" == "Synology" ]]; then
|
if [[ "$DISTRIBUTION" == "Synology" ]]; then
|
||||||
sed -i "s#/usr/bin/\(cp\|rm\|rsync\|logger\)\$#/opt/bin/\1#" "$BKP_DIR"/etc/rsnapshot.global.conf
|
sed -i "s#/usr/bin/\(rsync\|logger\)\$#/opt/bin/\1#" "$BKP_DIR"/etc/rsnapshot.global.conf
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
config_version 1.2
|
config_version 1.2
|
||||||
|
|
||||||
cmd_cp /usr/bin/cp
|
cmd_cp /usr/bin/cp
|
||||||
cmd_rm /usr/bin/rm
|
cmd_rm /usr/bin/rs-rm
|
||||||
cmd_rsync /usr/bin/rsync
|
cmd_rsync /usr/bin/rsync
|
||||||
cmd_logger /usr/bin/logger
|
cmd_logger /usr/bin/logger
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,44 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
##
|
||||||
|
# Copyright (C) 2013-2016 Janek Bevendorff
|
||||||
|
# Website: http://www.refining-linux.org/
|
||||||
|
#
|
||||||
|
# Recursively adjust permissions of given directory and remove it.
|
||||||
|
#
|
||||||
|
# The MIT License (MIT)
|
||||||
|
#
|
||||||
|
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
# of this software and associated documentation files (the "Software"), to deal
|
||||||
|
# in the Software without restriction, including without limitation the rights
|
||||||
|
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
# copies of the Software, and to permit persons to whom the Software is
|
||||||
|
# furnished to do so, subject to the following conditions:
|
||||||
|
#
|
||||||
|
# The above copyright notice and this permission notice shall be included in
|
||||||
|
# all copies or substantial portions of the Software.
|
||||||
|
#
|
||||||
|
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
# THE SOFTWARE.
|
||||||
|
##
|
||||||
|
|
||||||
|
if [ "$1" == "" ]; then
|
||||||
|
. rs-version
|
||||||
|
echo "Usage: $(basename $0) <flags> <directory>"
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
|
||||||
|
flags="$1"
|
||||||
|
dir="$2"
|
||||||
|
if [ "$2" == "" ]; then
|
||||||
|
dir="$1"
|
||||||
|
flags=""
|
||||||
|
fi
|
||||||
|
|
||||||
|
chmod -R +w "$dir"
|
||||||
|
rm $flags "$dir"
|
||||||
|
|
Loading…
Reference in New Issue