Fix "line 89: 4: Bad file descriptor" when printing usage without config set up
This commit is contained in:
parent
26dc5cab55
commit
5a5244e164
1 changed files with 8 additions and 5 deletions
|
|
@ -42,6 +42,12 @@ CONFIG="duplicity-backup.conf"
|
||||||
# Script Happens Below This Line - Shouldn't Require Editing #
|
# Script Happens Below This Line - Shouldn't Require Editing #
|
||||||
##############################################################
|
##############################################################
|
||||||
|
|
||||||
|
# make a backup of stdout and stderr for later
|
||||||
|
exec 6>&1
|
||||||
|
exec 7>&2
|
||||||
|
|
||||||
|
# ------------------------------------------------------------
|
||||||
|
|
||||||
usage(){
|
usage(){
|
||||||
echo "USAGE:
|
echo "USAGE:
|
||||||
$(basename "$0") [options]
|
$(basename "$0") [options]
|
||||||
|
|
@ -86,7 +92,7 @@ echo "USAGE:
|
||||||
EXCLIST (directories excluded) = ${EXCLIST[*]:0}
|
EXCLIST (directories excluded) = ${EXCLIST[*]:0}
|
||||||
ROOT (root directory of backup) = ${ROOT}
|
ROOT (root directory of backup) = ${ROOT}
|
||||||
LOGFILE (log file path) = ${LOGFILE}
|
LOGFILE (log file path) = ${LOGFILE}
|
||||||
" >&4
|
" >&6
|
||||||
}
|
}
|
||||||
|
|
||||||
DUPLICITY="$(which duplicity)"
|
DUPLICITY="$(which duplicity)"
|
||||||
|
|
@ -268,9 +274,6 @@ fi
|
||||||
# fd5 is never shown on screen but always logged (for delimiters in the log)
|
# fd5 is never shown on screen but always logged (for delimiters in the log)
|
||||||
#
|
#
|
||||||
|
|
||||||
# make a backup of stderr for later
|
|
||||||
exec 6>&2
|
|
||||||
|
|
||||||
# fd2 and fd3 are always logged and shown on screen via tee
|
# fd2 and fd3 are always logged and shown on screen via tee
|
||||||
# for fd2 (original stderr) the output of tee needs to be redirected to stderr
|
# for fd2 (original stderr) the output of tee needs to be redirected to stderr
|
||||||
exec 2> >(tee -ia "${LOGFILE}" >&2)
|
exec 2> >(tee -ia "${LOGFILE}" >&2)
|
||||||
|
|
@ -1050,6 +1053,6 @@ unset FTP_PASSWORD
|
||||||
|
|
||||||
# restore stdout and stderr to their original values
|
# restore stdout and stderr to their original values
|
||||||
# and close the other fd
|
# and close the other fd
|
||||||
exec 1>&4 2>&6 3>&- 4>&- 5>&- 6>&-
|
exec 1>&6 2>&7 3>&- 4>&- 5>&- 6>&- 7>&-
|
||||||
|
|
||||||
# vim: set tabstop=2 shiftwidth=2 sts=2 autoindent smartindent:
|
# vim: set tabstop=2 shiftwidth=2 sts=2 autoindent smartindent:
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue