if [[ "$(type -t _gsu_setup)" != "function" ]]; then
gsu_dir=${gsu_dir:-${BASH_SOURCE[0]%/*}}
- . $gsu_dir/common || exit 1
+ . "$gsu_dir/common" || exit 1
_gsu_setup
fi
fi
x="${result#* }"
y="${result%% *}"
- (($x > 190)) && x=190
+ ((x > 190)) && x=190
result="$y $x"
}
case "$ec" in
0) ret=$GSU_SUCCESS;;
- 1) ret=1;; # cancelled
+ 1|255) ret=1;; # cancelled
*)
result="dialog exit code $ec"
ret=-$E_GSU_DIALOG
# Some versions of dialog segfault if the text is too long. Hence we
# always use a temporary file.
gsu_make_tempfile 'gsu_msgbox.XXXXXXXXXX'
- (($ret < 0)) && return
+ ((ret < 0)) && return
tmp="$result"
trap "rm -f $tmp" EXIT
echo "$1" > "$tmp"
{
local header="${1:-root}"
local items="$2"
- local i state opts num=0
+ local geom
_get_geometry
- opts="$result 16"
- for i in $items; do
- let num++
- opts+=" $i $num"
- done
- result="$(dialog --menu "$gsu_banner_txt ($header)" $opts 3>&1 1>&2 2>&3 3>&-)"
+ geom=$result
+ result="$(dialog --no-lines --no-items --menu \
+ "$gsu_banner_txt ($header)" \
+ $geom 16 $items 3>&1 1>&2 2>&3 3>&-)"
_set_dialog_ret $?
}
#echo "line: $line_num, root: $root, indent level: $level"
result="$(sed -e "1,${line_num}d;" <<< "$tree" \
| sed -e "/^$TAB\{1,$level\}$_gsu_node_name_pattern/,\$d" \
- | sed -e "/^$TAB\{$(($level + 2))\}/d")"
+ | sed -e "/^$TAB\{$((level + 2))\}/d")"
if (($? != 0)); then
ret=-$E_GSU_MENU_TREE
result="sed command for subtree $root failed"
while :; do
_gsu_menu "$header" "$subtree"
- (($ret < 0)) && return
+ ((ret < 0)) && return
[[ -z "$result" ]] && return # menu was cancelled
if [[ "${result%/}" != "$result" ]]; then
old_header="$header"
header="$result"
_get_subtree "$tree" "$header"
- (($ret < 0)) && return
+ ((ret < 0)) && return
_browse "$header" "$tree" "$result"
- (($ret < 0)) && return
+ ((ret < 0)) && return
header="$old_header"
continue
fi