mirror of
https://github.com/smxi/inxi.git
synced 2024-11-17 00:31:19 +00:00
(change version)
found a bug, inxi is using gawk before the depends check, this creates bad output in ubuntu/mint unless it has gawk. Fixed by moving tests to after dependency checks.
This commit is contained in:
parent
182c622d46
commit
81365d855f
16
inxi
16
inxi
|
@ -1,8 +1,8 @@
|
|||
#!/bin/bash
|
||||
########################################################################
|
||||
#### Script Name: inxi
|
||||
#### version: 1.2.6
|
||||
#### Date: November 16 2009
|
||||
#### version: 1.2.7
|
||||
#### Date: November 17 2009
|
||||
########################################################################
|
||||
#### SPECIAL THANKS
|
||||
########################################################################
|
||||
|
@ -387,6 +387,13 @@ main()
|
|||
check_script_depends
|
||||
check_script_suggested_apps
|
||||
|
||||
# note: this needs to go AFTER depends check because these use gawk
|
||||
# Do this after sourcing of config overrides so user can customize banwords
|
||||
# Contrary to my previous belief, "${ARR[@]}" passes a quoted list, not one string
|
||||
BAN_LIST_NORMAL=$( make_ban_lists "${A_NORMAL_BANS[@]}" )
|
||||
BAN_LIST_CPU=$( make_ban_lists "${A_CPU_BANS[@]}" )
|
||||
##echo "BAN_LIST_NORMAL='$BAN_LIST_NORMAL'"
|
||||
|
||||
# first init function must be set first for colors etc. Remember, no debugger
|
||||
# stuff works on this function unless you set the debugging flag manually.
|
||||
# Debugging flag -@ [number] will not work until get_parameters runs.
|
||||
|
@ -510,11 +517,6 @@ initialize_script_data()
|
|||
##echo "PATH='$PATH'"
|
||||
##/bin/sh -c 'echo "PATH in subshell=\"$PATH\""'
|
||||
|
||||
# Do this after sourcing of config overrides so user can customize banwords
|
||||
BAN_LIST_NORMAL=$( make_ban_lists "${A_NORMAL_BANS[@]}" ) # Contrary to my previous belief, "${ARR[@]}" passes a quoted list, not one string
|
||||
BAN_LIST_CPU=$( make_ban_lists "${A_CPU_BANS[@]}" )
|
||||
##echo "BAN_LIST_NORMAL='$BAN_LIST_NORMAL'"
|
||||
|
||||
# now set the script BOOLEANS for files required to run features
|
||||
if [[ -d "/proc/" ]];then
|
||||
B_PROC='true'
|
||||
|
|
Loading…
Reference in a new issue