asif/borgScripts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

derive restorePath abs path

Browse Source 
Fixes the touch.test removal error and is more robust in commands.
This commit is contained in:
Asif Bacchus 2020-03-27 02:59:17 -06:00
parent 37bd4e69c6
commit 29ab2c11a3
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
borghelper.sh
View File

@ -274,6 +274,12 @@ if [ "$restoreOptions" ]; then restoreOptions=${restoreOptions##[[:space:]]}; fi
# check/create restore path # check/create restore path
if [ "$operation" = 'restore' ]; then if [ "$operation" = 'restore' ]; then
if [ -d "$restorePath" ]; then if [ -d "$restorePath" ]; then
# convert to absolute path
restorePath=$(
cd "$restorePath" || \
consoleError 5 'Cannot access specified restore directory.'; \
pwd -P
)
if ! touch "${restorePath}/touch.test" > /dev/null 2>&1; then if ! touch "${restorePath}/touch.test" > /dev/null 2>&1; then
consoleError 5 'Cannot write to specified restore directory.' consoleError 5 'Cannot write to specified restore directory.'
fi fi
@ -281,6 +287,12 @@ if [ "$operation" = 'restore' ]; then
if ! mkdir -p "${restorePath}" > /dev/null 2>&1; then if ! mkdir -p "${restorePath}" > /dev/null 2>&1; then
consoleError 5 'Cannot create specified restore directory.' consoleError 5 'Cannot create specified restore directory.'
else else
# convert to absolute path
restorePath=$(
cd "$restorePath" || \
consoleError 5 'Cannot access specified restore directory.'; \
pwd -P
)
if ! touch "${restorePath}/touch.test" > /dev/null 2>&1; then if ! touch "${restorePath}/touch.test" > /dev/null 2>&1; then
consoleError 5 'Cannot write to specified restore directory.' consoleError 5 'Cannot write to specified restore directory.'
fi fi
@ -398,6 +410,6 @@ exit 0
# 2: parameter missing/invalid in .borgvars file # 2: parameter missing/invalid in .borgvars file
# 3: could not create/remove borg tmp directory # 3: could not create/remove borg tmp directory
# 4: could not write sample borgvars file (permissions?) # 4: could not write sample borgvars file (permissions?)
# 5: cannot create/write to restore path or could not remove touch.test file # 5: cannot access/create/write to restore path or could not remove test file
#EOF #EOF