Skip to content
Snippets Groups Projects
Commit 11601b4c authored by micah's avatar micah :speech_balloon:
Browse files

Add fix from anarcat for ${configdirectory} in ninjahelper, also add -L to...

Add fix from anarcat for ${configdirectory} in ninjahelper, also add -L to find to follow symlinks in case this
directory is actually not a directory, but instead a symlink to somewhere else
parent f07f4b87
No related branches found
No related tags found
No related merge requests found
...@@ -9,7 +9,7 @@ version 0.9.4 -- unreleased ...@@ -9,7 +9,7 @@ version 0.9.4 -- unreleased
from the one in the configuration file (default is root as before). from the one in the configuration file (default is root as before).
Thanks to Martin Krafft for the patch (Closes: #370396). Thanks to Martin Krafft for the patch (Closes: #370396).
. When determining which backup actions to make, find now follows . When determining which backup actions to make, find now follows
symlinks for /etc/backup.d symlinks for $configdirectory
handler changes handler changes
Added tar handler Added tar handler
mysql: mysql:
...@@ -53,6 +53,9 @@ version 0.9.4 -- unreleased ...@@ -53,6 +53,9 @@ version 0.9.4 -- unreleased
. found_vservers: escaped special grep repetition character + . found_vservers: escaped special grep repetition character +
ninjahelper changes ninjahelper changes
. Recursively ignore subdirs in /etc/backup.d (Closes: #361102) . Recursively ignore subdirs in /etc/backup.d (Closes: #361102)
. Fix configdirectory error that forced you to use /etc/backup.d, thanks anarcat
. When determining which backup actions to list, find now follows
symlinks for $configdirectory
changed cron permissions to 644 changed cron permissions to 644
minor documentation fixes minor documentation fixes
......
...@@ -257,7 +257,7 @@ while true; do ...@@ -257,7 +257,7 @@ while true; do
menulist= menulist=
action= action=
let "i = 1" let "i = 1"
for file in `find $conf/etc/backup.d/ -mindepth 1 -maxdepth 1 -type f ! -name '.*.swp' | sort -n`; do for file in `find -L ${configdirectory} -mindepth 1 -maxdepth 1 -type f ! -name '.*.swp' | sort -n`; do
menulist="$menulist $i $file" menulist="$menulist $i $file"
actions[$i]=$file actions[$i]=$file
let "i += 1" let "i += 1"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment