From 17ea19bf65424de625411f1ab5cd5fa5164b7609 Mon Sep 17 00:00:00 2001 From: JRGTH Date: Thu, 8 Jul 2021 15:37:36 -0400 Subject: [PATCH] Deprecate command parameters not starting with dash here too --- usr/local/share/bastille/export.sh | 12 ++++++------ usr/local/share/bastille/import.sh | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/usr/local/share/bastille/export.sh b/usr/local/share/bastille/export.sh index 400db633..a76708b5 100644 --- a/usr/local/share/bastille/export.sh +++ b/usr/local/share/bastille/export.sh @@ -91,38 +91,38 @@ opt_count() { # Handle and parse option args while [ $# -gt 0 ]; do case "${1}" in - gz|--gz) + --gz) GZIP_EXPORT="1" TARGET="${2}" opt_count shift ;; - tgz|--tgz) + --tgz) TGZ_EXPORT="1" TARGET="${2}" opt_count zfs_enable_check shift ;; - txz|--txz) + --txz) TXZ_EXPORT="1" TARGET="${2}" opt_count zfs_enable_check shift ;; - -s|safe|--safe) + -s|--safe) SAFE_EXPORT="1" TARGET="${2}" shift ;; - -r|raw|--raw) + -r|--raw) RAW_EXPORT="1" TARGET="${2}" opt_count shift ;; - -v|verbose|--verbose) + -v|--verbose) OPT_ZSEND="-Rv" TARGET="${2}" shift diff --git a/usr/local/share/bastille/import.sh b/usr/local/share/bastille/import.sh index feba6029..a68387ea 100644 --- a/usr/local/share/bastille/import.sh +++ b/usr/local/share/bastille/import.sh @@ -63,12 +63,12 @@ OPT_ZRECV="-u" # Handle and parse option args while [ $# -gt 0 ]; do case "${1}" in - -f|force|--force) + -f|--force) OPT_FORCE="1" TARGET="${2}" shift ;; - -v|verbose|--verbose) + -v|--verbose) OPT_ZRECV="-u -v" TARGET="${2}" shift