mirror of https://github.com/MISP/MISP
fix: [shell] ask_o () needed some quotes, regenerated installer.
parent
f215a66506
commit
e64d16d124
|
@ -383,19 +383,19 @@ ask_o () {
|
|||
|
||||
ANSWER=""
|
||||
|
||||
if [ -z ${1} ]; then
|
||||
if [ -z "${1}" ]; then
|
||||
echo "This function needs at least 1 parameter."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
[ -z $2 ] && OPT1="y" || OPT1=$2
|
||||
[ -z $3 ] && OPT2="n" || OPT2=$3
|
||||
[ -z "${2}" ] && OPT1="y" || OPT1="${2}"
|
||||
[ -z "${3}" ] && OPT2="n" || OPT2="${3}"
|
||||
|
||||
while true; do
|
||||
case $ANSWER in ${OPT1} | ${OPT2}) break ;; esac
|
||||
case "${ANSWER}" in "${OPT1}" | "${OPT2}") break ;; esac
|
||||
echo -n "${1} (${OPT1}/${OPT2}) "
|
||||
read ANSWER
|
||||
ANSWER=$(echo $ANSWER | tr '[:upper:]' '[:lower:]')
|
||||
ANSWER=$(echo "${ANSWER}" | tr '[:upper:]' '[:lower:]')
|
||||
done
|
||||
|
||||
}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
; Generated by RHash v1.3.8 on 2019-06-15 at 11:23.55
|
||||
; Generated by RHash v1.3.8 on 2019-06-15 at 11:35.25
|
||||
; Written by Kravchenko Aleksey (Akademgorodok) - http://rhash.sf.net/
|
||||
;
|
||||
; 94835 11:23.55 2019-06-15 INSTALL.sh
|
||||
INSTALL.sh 564E41C2909579424D411DECDF4A4254C397873B CDD652ACC031C5514D9ACAAEB5BD97211FCB892F38416DA6FB31320BB6882858 42B4551EC3F8FFD625944B3B4482078E6F5BF4D2A72DB155138BE31CE66BFA8A7D59F01D39107C0BB747270BC925121D A46B9891C1496E035C4F1281246AB44811503F6980A46050AF24A8D2849ABC8DC78F5F765A1F7915593B9AFB4073492546D36E471045C4785E2998EA984C0751
|
||||
; 94865 11:35.25 2019-06-15 INSTALL.sh
|
||||
INSTALL.sh 420221929FEA7498E519A555C99398446FBD075B 9A5BE9A86E7A50051442E398B659B2FA5C0E4B1C4FC92E36BF70BF4394B70EFD 753F7342EB7CC9F4A17E29D34C590CF53B80C9FF6978DD60D1E31692670143BDC2A580EC1C1D280925A3553259A99038 494694AED99013F6C13B6F58B36BDFB48F07D49144CCA6865441989583593760BBEC23F446A631E77C175E4008A93340ABD4B01739671ADF4175645C08C9984F
|
||||
|
|
|
@ -1 +1 @@
|
|||
564e41c2909579424d411decdf4a4254c397873b INSTALL.sh
|
||||
420221929fea7498e519a555c99398446fbd075b INSTALL.sh
|
||||
|
|
|
@ -1 +1 @@
|
|||
cdd652acc031c5514d9acaaeb5bd97211fcb892f38416da6fb31320bb6882858 INSTALL.sh
|
||||
9a5be9a86e7a50051442e398b659b2fa5c0e4b1c4fc92e36bf70bf4394b70efd INSTALL.sh
|
||||
|
|
|
@ -1 +1 @@
|
|||
42b4551ec3f8ffd625944b3b4482078e6f5bf4d2a72db155138be31ce66bfa8a7d59f01d39107c0bb747270bc925121d INSTALL.sh
|
||||
753f7342eb7cc9f4a17e29d34c590cf53b80c9ff6978dd60d1e31692670143bdc2a580ec1c1d280925a3553259a99038 INSTALL.sh
|
||||
|
|
|
@ -1 +1 @@
|
|||
a46b9891c1496e035c4f1281246ab44811503f6980a46050af24a8d2849abc8dc78f5f765a1f7915593b9afb4073492546d36e471045c4785e2998ea984c0751 INSTALL.sh
|
||||
494694aed99013f6c13b6f58b36bdfb48f07d49144cca6865441989583593760bbec23f446a631e77c175e4008a93340abd4b01739671adf4175645c08c9984f INSTALL.sh
|
||||
|
|
|
@ -229,19 +229,19 @@ ask_o () {
|
|||
|
||||
ANSWER=""
|
||||
|
||||
if [ -z ${1} ]; then
|
||||
if [ -z "${1}" ]; then
|
||||
echo "This function needs at least 1 parameter."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
[ -z $2 ] && OPT1="y" || OPT1=$2
|
||||
[ -z $3 ] && OPT2="n" || OPT2=$3
|
||||
[ -z "${2}" ] && OPT1="y" || OPT1="${2}"
|
||||
[ -z "${3}" ] && OPT2="n" || OPT2="${3}"
|
||||
|
||||
while true; do
|
||||
case $ANSWER in ${OPT1} | ${OPT2}) break ;; esac
|
||||
case "${ANSWER}" in "${OPT1}" | "${OPT2}") break ;; esac
|
||||
echo -n "${1} (${OPT1}/${OPT2}) "
|
||||
read ANSWER
|
||||
ANSWER=$(echo $ANSWER | tr '[:upper:]' '[:lower:]')
|
||||
ANSWER=$(echo "${ANSWER}" | tr '[:upper:]' '[:lower:]')
|
||||
done
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue