diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2009-02-28 17:07:01 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2009-02-28 17:07:01 +0100 |
| commit | 008773ad691bfa59bc3e0a1ef89b798cea5107bf (patch) | |
| tree | 8b011f261adb897faa310b5304f0c86a9415b3b0 /src/core/libs/lib-ui.sh | |
| parent | a22294e811ffc7b5765aa0b7190b438588222e1b (diff) | |
clearer debugging in ask_option functions + fixes in cli_ask_option + font fix in set_keymap
Diffstat (limited to 'src/core/libs/lib-ui.sh')
| -rw-r--r-- | src/core/libs/lib-ui.sh | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/core/libs/lib-ui.sh b/src/core/libs/lib-ui.sh index 336a3e7..90afeba 100644 --- a/src/core/libs/lib-ui.sh +++ b/src/core/libs/lib-ui.sh @@ -366,7 +366,7 @@ _dia_ask_option () _dia_DIALOG $DEFAULT --cancel-label $CANCEL_LABEL --colors --title " $DIA_MENU_TITLE " --menu "$DIA_MENU_TEXT $EXTRA_INFO" 20 80 16 "$@" 2>$ANSWER ret=$? ANSWER_OPTION=`cat $ANSWER` - debug 'UI' "dia_ask_option: User choose $ANSWER_OPTION ($DIA_MENU_TITLE)" + debug 'UI' "dia_ask_option: ANSWER_OPTION: $ANSWER_OPTION, returncode (skip/cancel): $ret ($DIA_MENU_TITLE)" [ $TYPE == required ] && return $ret return 0 # TODO: check if dialog returned >0 because of an other reason then the user hitting 'cancel/skip' } @@ -544,11 +544,14 @@ _cli_ask_option () [ -n "$DEFAULT" ] && echo -n " > [ $DEFAULT ] " [ -z "$DEFAULT" ] && echo -n " > " read ANSWER_OPTION + ret=0 [ -z "$ANSWER_OPTION" -a -n "$DEFAULT" ] && ANSWER_OPTION="$DEFAULT" - debug 'UI' "cli_ask_option: User choose $ANSWER_OPTION ($MENU_TITLE)" - [ "$ANSWER_OPTION" = CANCEL ] && return 1 - [ -z "$ANSWER_OPTION" -a type == required ] && return 1 - return 0 + [ "$ANSWER_OPTION" == CANCEL ] && ret=1 && ANSWER_OPTION= + [ "$ANSWER_OPTION" == SKIP ] && ret=0 && ANSWER_OPTION= + [ -z "$ANSWER_OPTION" -a "$TYPE" == required ] && ret=1 + + debug 'UI' "cli_ask_option: ANSWER_OPTION: $ANSWER_OPTION, returncode (skip/cancel): $ret ($MENU_TITLE)" + return $ret } @@ -648,7 +651,7 @@ set_keymap () for i in $(find $KBDDIR/consolefonts -maxdepth 1 ! -name '*.cp.gz' -name "*.gz" | sed 's|^.*/||g' | sort); do FONTS="$FONTS $i -" done - ask_option "$var_CONSOLEFONT" "Select A Console Font" '' optional $FONTS + ask_option "${var_CONSOLEFONT:-no}" "Select A Console Font" '' optional $FONTS if [ -n "$ANSWER_OPTION" ] then var_CONSOLEFONT=$ANSWER_OPTION |