evolix/ansible-roles
22
2
Fork 2
Code Issues 61 Pull requests 18 Releases 34 Wiki Activity

Release 22.05 #155

Merged
jlecour merged 81 commits from unstable into stable 2022-05-10 17:01:18 +02:00
Conversation 0 Commits 81 Files changed 72 +43 -6
1 changed files with 43 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit f0b23ffa50 - Show all commits

49
evolinux-base/files/dump-server-state.sh
View file

@ -2,7 +2,7 @@
PROGNAME="dump-server-state"
VERSION="22.03.6"
VERSION="22.03.7"
readonly VERSION
dump_dir=
@ -808,26 +808,63 @@ while :; do
FORCE=1
;;
-d|--dump-dir|--backup-dir)
-d|--dump-dir)
# with value separated by space
if [ -n "$2" ]; then
dump_dir=$2
shift
else
printf 'ERROR: "-d|--dump-dir|--backup-dir" requires a non-empty option argument.\n' >&2
printf 'ERROR: "-d|--dump-dir" requires a non-empty option argument.\n' >&2
exit 1
fi
;;
--dump-dir=?*|--backup-dir=?*)
--dump-dir=?*)
# with value speparated by =
dump_dir=${1#*=}
;;
--dump-dir=|--backup-dir=)
--dump-dir=)
# without value
printf 'ERROR: "--dump-dir|--backup-dir" requires a non-empty option argument.\n' >&2
printf 'ERROR: "--dump-dir" requires a non-empty option argument.\n' >&2
exit 1
;;
--backup-dir)
printf 'WARNING: "--backup-dir" is deprecated in favor of "--dump-dir".\n'
if [ -n "${dump_dir}" ]; then
debug "Dump directory is already set, let's ignore this one."
else
debug "Dump directory is not set already, let's stay backward compatible."
# with value separated by space
if [ -n "$2" ]; then
dump_dir=$2
shift
else
printf 'ERROR: "--backup-dir" requires a non-empty option argument.\n' >&2
exit 1
fi
fi
;;
--backup-dir=?*)
# with value speparated by =
printf 'WARNING: "--backup-dir" is deprecated in favor of "--dump-dir".\n'
if [ -n "${dump_dir}" ]; then
debug "Dump directory is already set, let's ignore this one."
else
debug "Dump directory is not set already, let's stay backward compatible."
dump_dir=${1#*=}
fi
;;
--backup-dir=)
# without value
printf 'WARNING: "--backup-dir" is deprecated in favor of "--dump-dir".\n'
if [ -n "${dump_dir}" ]; then
debug "Dump directory is already set, let's ignore this one."
else
printf 'ERROR: "--backup-dir" requires a non-empty option argument.\n' >&2
exit 1
fi
;;
--etc)
DO_ETC=1
;;