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

Remove --threebuttons option

This commit is contained in:
Santiago Lo Coco 2022-02-16 13:55:03 -03:00
parent 1f8b1065e1
commit 1463e40029
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/common.sh
View File

@ -14,7 +14,7 @@ useDialog() {
useDialogListOrMenu "$@" useDialogListOrMenu "$@"
exit exit
fi fi
inputbox=false; passwordbox=false; infobox=false; threebuttons=false; yesno=false inputbox=false; passwordbox=false; infobox=false
str=$(getLastArgument "$@") str=$(getLastArgument "$@")
if [ "$str" = "VALUES" ]; then if [ "$str" = "VALUES" ]; then
argc="$#"; i=1 argc="$#"; i=1
@ -25,9 +25,6 @@ useDialog() {
[ "$item" = "--inputbox" ] && inputbox=true [ "$item" = "--inputbox" ] && inputbox=true
[ "$item" = "--passwordbox" ] && passwordbox=true [ "$item" = "--passwordbox" ] && passwordbox=true
[ "$item" = "--infobox" ] && infobox=true [ "$item" = "--infobox" ] && infobox=true
[ "$item" = "--threebuttons" ] && threebuttons=true
[ "$item" = "--yesno" ] && yesno=true
[ "$yesno" = true ] && args+=("$item")
((i++)) ((i++))
done done
fi fi
@ -38,9 +35,6 @@ useDialog() {
height=$((height+2)) height=$((height+2))
fi fi
[ $infobox = true ] && height=$((height-2)) [ $infobox = true ] && height=$((height-2))
if [ "$threebuttons" = true ]; then
set -- --yes-label "$2" --extra-button --extra-label "$3" --no-label "$4" "${args[@]}"
fi
formatOptions "$@" formatOptions "$@"
if [ "$found" = false ]; then if [ "$found" = false ]; then
dialog "$@" ${height} ${width} dialog "$@" ${height} ${width}
@ -55,7 +49,7 @@ useWhiptail() {
exit exit
fi fi
[ "$1" = "--infobox" ] && tty | grep -q "/dev/pts" && local TERM=ansi [ "$1" = "--infobox" ] && tty | grep -q "/dev/pts" && local TERM=ansi
inputbox=false; infobox=false; threebuttons=false; yesno=false inputbox=false; infobox=false
str=$(getLastArgument "$@") str=$(getLastArgument "$@")
if [ "$str" = "VALUES" ]; then if [ "$str" = "VALUES" ]; then
argc="$#"; i=1 argc="$#"; i=1
@ -65,9 +59,6 @@ useWhiptail() {
fi fi
[ "$item" = "--inputbox" ] && inputbox=true [ "$item" = "--inputbox" ] && inputbox=true
[ "$item" = "--infobox" ] && infobox=true [ "$item" = "--infobox" ] && infobox=true
[ "$item" = "--threebuttons" ] && threebuttons=true
[ "$item" = "--yesno" ] && yesno=true
[ "$yesno" = true ] && args+=("$item")
((i++)) ((i++))
done done
fi fi
@ -75,20 +66,12 @@ useWhiptail() {
height=$(calcHeightWhiptail "$str") height=$(calcHeightWhiptail "$str")
[ $inputbox = true ] && [ "$width" -lt 30 ] && width=$((width+5)) [ $inputbox = true ] && [ "$width" -lt 30 ] && width=$((width+5))
[ $infobox = true ] && height=$((height-1)) [ $infobox = true ] && height=$((height-1))
if [ "$threebuttons" = true ]; then
set -- --yes-button "$2" --no-button "$3" "${args[@]}"
fi
formatOptions "$@" formatOptions "$@"
if [ "$found" = false ]; then if [ "$found" = false ]; then
height=0; width=0 height=0; width=0
whiptail "$@" ${height} ${width} whiptail "$@" ${height} ${width}
else else
whiptail "${options[@]}" whiptail "${options[@]}"
retVal=$?
if [ "$threebuttons" = true ]; then
[ $retVal -eq 1 ] && return 3
fi
return $retVal
fi fi
} }