mirror of
https://github.com/smxi/inxi.git
synced 2024-11-16 16:21:39 +00:00
code synching and cleanup
This commit is contained in:
parent
491d758c27
commit
c8067e48a9
7
inxi
7
inxi
|
@ -167,7 +167,6 @@ LANG=C
|
|||
### Variable initializations: null values
|
||||
CMDL_MAX=''
|
||||
COLOR_SCHEME=''
|
||||
COLOR_SCHEME_SET=''
|
||||
# override in user config if desired, seems like less than .3 doesn't work as reliably
|
||||
CPU_SLEEP='0.3'
|
||||
DEV_DISK_LABEL=''
|
||||
|
@ -201,6 +200,7 @@ A_X_DATA=''
|
|||
# flag to allow distro maintainers to turn off update features. If false, turns off
|
||||
# -U and -! testing/advanced update options, as well as removing the -U help menu item
|
||||
B_ALLOW_UPDATE='true'
|
||||
B_COLOR_SCHEME_SET='false'
|
||||
# triggers full display of cpu flags
|
||||
B_CPU_FLAGS_FULL='false'
|
||||
# test for dbus irc client
|
||||
|
@ -390,6 +390,7 @@ A_COLOR_SCHEMES=(
|
|||
EMPTY,EMPTY,EMPTY
|
||||
NORMAL,NORMAL,NORMAL
|
||||
|
||||
BLUE,NORMAL,NORMAL
|
||||
DCYAN,NORMAL,NORMAL
|
||||
MAGENTA,NORMAL,NORMAL
|
||||
RED,NORMAL,NORMAL
|
||||
|
@ -541,7 +542,7 @@ main()
|
|||
get_parameters "$@"
|
||||
|
||||
# If no colorscheme was set in the parameter handling routine, then set the default scheme
|
||||
if [[ $COLOR_SCHEME_SET != 'true' ]];then
|
||||
if [[ $B_COLOR_SCHEME_SET != 'true' ]];then
|
||||
# This will only trigger on first run out of irc cases, let's user pick their color scheme
|
||||
# The override value only will occur in user config files
|
||||
if [[ $B_RUNNING_IN_SHELL == 'true' ]];then
|
||||
|
@ -1186,7 +1187,7 @@ get_parameters()
|
|||
if [[ $OPTARG == '99' ]];then
|
||||
B_RUN_COLOR_SELECTOR='true'
|
||||
else
|
||||
COLOR_SCHEME_SET='true'
|
||||
B_COLOR_SCHEME_SET='true'
|
||||
## note: not sure about this, you'd think user values should be overridden, but
|
||||
## we'll leave this for now
|
||||
if [[ -z $COLOR_SCHEME ]];then
|
||||
|
|
Loading…
Reference in a new issue