mirror of
https://github.com/smxi/inxi.git
synced 2024-11-16 16:21:39 +00:00
made console out of x, and terminal in x for variables
This commit is contained in:
parent
130af28e1f
commit
585519855c
28
inxi
28
inxi
|
@ -308,7 +308,7 @@ DEFAULT_COLOR_SCHEME=2
|
|||
# for user changes easier after sourcing the files
|
||||
GLOBAL_COLOR_SCHEME=''
|
||||
IRC_COLOR_SCHEME=''
|
||||
IRC_TERM_COLOR_SCHEME=''
|
||||
IRC_CONS_COLOR_SCHEME=''
|
||||
CONSOLE_COLOR_SCHEME=''
|
||||
VIRT_TERM_COLOR_SCHEME=''
|
||||
|
||||
|
@ -568,8 +568,8 @@ main()
|
|||
else
|
||||
if [[ -n $GLOBAL_COLOR_SCHEME ]];then
|
||||
set_color_scheme $GLOBAL_COLOR_SCHEME
|
||||
elif [[ -n $IRC_TERM_COLOR_SCHEME && -z $DISPLAY ]];then
|
||||
set_color_scheme $IRC_TERM_COLOR_SCHEME
|
||||
elif [[ -n $IRC_CONS_COLOR_SCHEME && -z $DISPLAY ]];then
|
||||
set_color_scheme $IRC_CONS_COLOR_SCHEME
|
||||
elif [[ -n $IRC_COLOR_SCHEME ]];then
|
||||
set_color_scheme $IRC_COLOR_SCHEME
|
||||
else
|
||||
|
@ -860,9 +860,9 @@ select_default_color_scheme()
|
|||
print_screen_output "[0m $(($i+2)))$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 for your $COLOR_SELECTION settings"
|
||||
print_screen_output "and hit ENTER. NOTE: You can bring this option list up by starting $SCRIPT_NAME with option: -c 95 (terminal),"
|
||||
print_screen_output "96 (virtual-terminal), 97 (irc), 98 (irc-terminal), 99 (global). Your selection(s) will be stored here: $config_file"
|
||||
print_screen_output "Global overrides virtual-terminal/terminal/irc/irc-terminal. Irc/irc-terminal/virtual-terminal/terminal removes global."
|
||||
print_screen_output "and hit ENTER. NOTE: You can bring this option list up by starting $SCRIPT_NAME with option: -c 95 (console),"
|
||||
print_screen_output "96 (virtual-terminal), 97 (irc), 98 (irc-console), 99 (global). Your selection(s) will be stored here: $config_file"
|
||||
print_screen_output "Global overrides virtual-terminal/console/irc/irc-console. Irc/irc-console/virtual-terminal/console removes global."
|
||||
print_screen_output "------------------------------------------------------------------------------"
|
||||
echo -n "[0m"
|
||||
read user_selection
|
||||
|
@ -871,10 +871,10 @@ select_default_color_scheme()
|
|||
irc)
|
||||
config_variable='IRC_COLOR_SCHEME'
|
||||
;;
|
||||
irc-terminal)
|
||||
config_variable='IRC_TERM_COLOR_SCHEME'
|
||||
irc-console)
|
||||
config_variable='IRC_CONS_COLOR_SCHEME'
|
||||
;;
|
||||
terminal)
|
||||
console)
|
||||
config_variable='CONSOLE_COLOR_SCHEME'
|
||||
;;
|
||||
virtual-terminal)
|
||||
|
@ -898,18 +898,18 @@ select_default_color_scheme()
|
|||
fi
|
||||
# file exists now so we can go on to cleanup
|
||||
case $COLOR_SELECTION in
|
||||
irc|irc-terminal|terminal|virtual-terminal)
|
||||
irc|irc-console|console|virtual-terminal)
|
||||
sed -i '/GLOBAL_COLOR_SCHEME=/d' $config_file
|
||||
;;
|
||||
global)
|
||||
sed -i -e '/VIRT_TERM_COLOR_SCHEME=/d' -e '/CONSOLE_COLOR_SCHEME=/d' -e '/IRC_COLOR_SCHEME=/d' \
|
||||
-e '/IRC_TERM_COLOR_SCHEME=/d' $config_file
|
||||
-e '/IRC_CONS_COLOR_SCHEME=/d' $config_file
|
||||
;;
|
||||
esac
|
||||
elif [[ $user_selection == $i ]];then
|
||||
print_screen_output "Removing all color settings from config file now..."
|
||||
sed -i -e '/VIRT_TERM_COLOR_SCHEME=/d' -e '/GLOBAL_COLOR_SCHEME=/d' -e '/CONSOLE_COLOR_SCHEME=/d' \
|
||||
-e '/IRC_COLOR_SCHEME=/d' -e '/IRC_TERM_COLOR_SCHEME=/d' $config_file
|
||||
-e '/IRC_COLOR_SCHEME=/d' -e '/IRC_CONS_COLOR_SCHEME=/d' $config_file
|
||||
set_color_scheme $DEFAULT_COLOR_SCHEME
|
||||
elif [[ $user_selection == $(( $i+1 )) ]];then
|
||||
print_screen_output "Ok, continuing $SCRIPT_NAME unchanged. You can set the colors anytime by starting with: -c 96 to 99"
|
||||
|
@ -1246,7 +1246,7 @@ get_parameters()
|
|||
;;
|
||||
98)
|
||||
B_RUN_COLOR_SELECTOR='true'
|
||||
COLOR_SELECTION='irc-terminal'
|
||||
COLOR_SELECTION='irc-console'
|
||||
;;
|
||||
97)
|
||||
B_RUN_COLOR_SELECTOR='true'
|
||||
|
@ -1258,7 +1258,7 @@ get_parameters()
|
|||
;;
|
||||
95)
|
||||
B_RUN_COLOR_SELECTOR='true'
|
||||
COLOR_SELECTION='terminal'
|
||||
COLOR_SELECTION='console'
|
||||
;;
|
||||
*)
|
||||
B_COLOR_SCHEME_SET='true'
|
||||
|
|
Loading…
Reference in a new issue