From 491d758c27bea6bb2b94ab80c6f798e51c26a39e Mon Sep 17 00:00:00 2001 From: inxi-svn Date: Tue, 26 Apr 2011 02:22:19 +0000 Subject: [PATCH] bug fixes --- inxi | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/inxi b/inxi index 5b225c3..1b3ae31 100755 --- a/inxi +++ b/inxi @@ -1,7 +1,7 @@ #!/bin/bash ######################################################################## #### Script Name: inxi -#### version: 1.4.82-b4 +#### version: 1.4.82-b5 #### Date: April 25 2011 ######################################################################## #### SPECIAL THANKS @@ -835,8 +835,8 @@ select_default_color_scheme() print_screen_output " $i)$spacer${C1} Card:${C2} nVidia G86 [GeForce 8400 GS] ${C1}X.Org${C2} 1.7.7" done set_color_scheme 0 - print_screen_output " $i)$spacer${C1} Continue, no changes or config file setting." - print_screen_output " $(($i+1)))$spacer${C1} Exit, use another terminal, or set manually." + print_screen_output " $i)$spacer Continue, no changes or config file setting." + print_screen_output " $(($i+1)))$spacer Exit, use another terminal, or set manually." print_screen_output "------------------------------------------------------------------------------" print_screen_output "Simply type the number for the color scheme that looks best to your eyes in the terminal client you are" print_screen_output "using and hit enter. NOTE: You can bring this option list up by starting $SCRIPT_NAME with this option: -c 99" @@ -858,11 +858,16 @@ select_default_color_scheme() sed -i "s/DEFAULT_TERM_COLOR_SCHEME=.*/DEFAULT_TERM_COLOR_SCHEME=$user_selection/" $HOME/.$SCRIPT_NAME/$SCRIPT_NAME.conf fi elif [[ $user_selection == $i ]];then + print_screen_output "Ok, continuing $SCRIPT_NAME using defaults. You can set the colors anytime by starting with: -c 99" + if [[ -n $DEFAULT_TERM_COLOR_SCHEME ]];then + set_color_scheme $DEFAULT_TERM_COLOR_SCHEME + else + set_color_scheme $DEFAULT_COLOR_SCHEME + fi + elif [[ $user_selection == $(( $i+1 )) ]];then set_color_scheme $DEFAULT_COLOR_SCHEME print_screen_output "Ok, exiting $SCRIPT_NAME now. You can set the colors later." exit 0 - elif [[ $user_selection == $(($i +1)) ]];then - print_screen_output "Ok, continuing $SCRIPT_NAME using defaults. You can set the colors anytime by starting with: -c 99" else print_screen_output "Error - Invalid Selection. You entered this: $user_selection" print_screen_output ""