From b87c65bc2e9513df95bbaca09ce8c1ac6d2a350a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D0=B5=D0=BC=D0=B8=D0=B9?= Date: Sat, 19 Jun 2021 12:45:25 +0300 Subject: [PATCH] add. to common.sh --- back_pwquality.sh | 14 ++++++++++---- common.sh | 3 +++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/back_pwquality.sh b/back_pwquality.sh index 29e27a7..a054657 100644 --- a/back_pwquality.sh +++ b/back_pwquality.sh @@ -27,9 +27,15 @@ _mk_pwquality_conf() { while [ -n "$1" ]; do case "$1" in --difok) shift; - _check_argument "$1" "--difok" - ;; - --minlen) + _check_argument_is_number "$1" "--difok" + ;; + --minlen) shift; + _check_argument_value "$1" "6" "--minlen" + ;; + --dcredit) shift; + _check_argument_is_number "$1" "--dcredit" "-" + ;; esac done - } +} +_mk_pwquality_conf --dcredit -1 diff --git a/common.sh b/common.sh index 092b1c9..75a0535 100644 --- a/common.sh +++ b/common.sh @@ -17,6 +17,9 @@ _check_argument_is_number() { if [[ "$1" == [0-9]* ]]; then return 0 else + if [ -n "$3" ]; then + grep -Exq -- "(\-|\+)[0-9]*" <<< "$1" && return 0 + fi error $"Argument to %s must be a number" "$2" return 1 fi