slococo
/
sadedot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use generic listOrMenu

This commit is contained in:
Santiago Lo Coco 2022-02-16 12:02:07 -03:00
parent 96edea1bad
commit ac3d75f81e
1 changed files with 21 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
scripts/common.sh
View File

@ -4,9 +4,9 @@ displayDialogBox() {
case $dialogBox in case $dialogBox in
whiptail) whiptail)
if [ "$1" = "--menu" ]; then if [ "$1" = "--menu" ]; then
useWhiptailMenu "$@" useWhiptailListOrMenu "$@"
elif [ "$1" = "--checklist" ]; then elif [ "$1" = "--checklist" ]; then
useWhiptailList "$@" useWhiptailListOrMenu "$@"
else else
if [ "$1" = "--infobox" ] && tty | grep -q "/dev/pts"; then if [ "$1" = "--infobox" ] && tty | grep -q "/dev/pts"; then
local TERM=ansi local TERM=ansi
@ -16,9 +16,9 @@ displayDialogBox() {
;; ;;
dialog) dialog)
if [ "$1" = "--menu" ]; then if [ "$1" = "--menu" ]; then
useDialogMenu "$@" useDialogListOrMenu "$@"
elif [ "$1" = "--checklist" ]; then elif [ "$1" = "--checklist" ]; then
useDialogList "$@" useDialogListOrMenu "$@"
else else
useDialog "$@" useDialog "$@"
fi fi
@ -187,12 +187,13 @@ getLastArgument() {
} }
formatOptions() { formatOptions() {
options=(); found=false options=(); found=false; isListOrMenu=false
# [ "$1" = "LIST" ] && list-height="$1" [[ "$1" == "--checklist" || "$1" == "--menu" ]] && isListOrMenu=true
for item in "$@"; do for item in "$@"; do
if [ "$item" = "VALUES" ]; then if [ "$item" = "VALUES" ]; then
options+=("${height}") options+=("${height}")
options+=("${width}") options+=("${width}")
[ $isListOrMenu = true ] && options+=("${listHeight}")
found=true found=true
continue continue
fi fi
@ -201,20 +202,9 @@ formatOptions() {
done done
} }
useWhiptailMenu() { getListOrMenuOptions() {
height=0; width=0 maxLen=0; i=1; j=1; notFound=true; msgLen=-1; argsQty=0; isList=false
formatOptions "$@" [ "$1" = "--checklist" ] && isList=true
whiptail --notags "${options[@]}"
}
useDialogMenu() {
height=9; width=60
formatOptions "$@"
dialog --no-tags "${options[@]}"
}
getListOptions() {
maxLen=0; i=1; j=1; notFound=true; msgLen=-1; argsQty=0
for item in "$@"; do for item in "$@"; do
[ "${item:0:2}" = "--" ] && continue [ "${item:0:2}" = "--" ] && continue
[ $i -eq $j ] && [ $msgLen = -1 ] && msgLen=${#item} [ $i -eq $j ] && [ $msgLen = -1 ] && msgLen=${#item}
@ -228,32 +218,25 @@ getListOptions() {
strLen=${#item} strLen=${#item}
[ $strLen -gt $maxLen ] && maxLen=$strLen [ $strLen -gt $maxLen ] && maxLen=$strLen
((argsQty++)) ((argsQty++))
[ $isList = false ] && ((j++))
fi fi
((j++)) ((j++))
done done
maxLen=$((maxLen+15)) && [ "$maxLen" -ge "$msgLen" ] || maxLen=$msgLen maxLen=$((maxLen+15)) && [ "$maxLen" -ge "$msgLen" ] || maxLen=$((msgLen+3))
argsQty=$((argsQty+8)) && [ "$argsQty" -le 20 ] || argsQty=20 [ "$dialogBox" = "whiptail" ] && heightOffset=9 || heightOffset=8
listHeight=$((argsQty-8)) && [ "$argsQty" -ge 10 ] || listHeight=$((argsQty-8)) argsQty=$((argsQty+heightOffset)) && [ "$argsQty" -le 20 ] || argsQty=20
options=(); found=false listHeight=$((argsQty-heightOffset)) && [ "$argsQty" -ge 10 ] || listHeight=$((argsQty-heightOffset))
for item in "$@"; do height=$argsQty; width=$maxLen
if [ "$item" = "VALUES" ]; then formatOptions "$@"
options+=("${argsQty}")
options+=("${maxLen}")
options+=("${listHeight}")
found=true
continue
fi
options+=("${item}")
done
} }
useDialogList() { useDialogListOrMenu() {
getListOptions "$@" getListOrMenuOptions "$@"
dialog --no-tags "${options[@]}" dialog --no-tags "${options[@]}"
} }
useWhiptailList() { useWhiptailListOrMenu() {
getListOptions "$@" getListOrMenuOptions "$@"
whiptail --notags --separate-output "${options[@]}" whiptail --notags --separate-output "${options[@]}"
} }