mirror of
https://github.com/smxi/inxi.git
synced 2024-11-17 00:31:19 +00:00
Still a gawk bug loomed. Fixed now. inxi will exit in Ubuntu with gawk requirement only now. (or any other distro gawk-less).
This commit is contained in:
parent
5c92c093fc
commit
c6d9f65838
18
inxi
18
inxi
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
########################################################################
|
########################################################################
|
||||||
#### Script Name: inxi
|
#### Script Name: inxi
|
||||||
#### version: 1.0.13
|
#### version: 1.0.13-b2
|
||||||
#### Date: 28 May 2009
|
#### Date: 28 May 2009
|
||||||
########################################################################
|
########################################################################
|
||||||
#### SPECIAL THANKS
|
#### SPECIAL THANKS
|
||||||
|
@ -234,7 +234,7 @@ DEFAULT_SCHEME=2
|
||||||
# Default indentation level
|
# Default indentation level
|
||||||
INDENT=10
|
INDENT=10
|
||||||
|
|
||||||
# logging eval variables, start and end function: Insert to LOGFS LOGFE when debug level 9, 10
|
# logging eval variables, start and end function: Insert to LOGFS LOGFE when debug level == 10
|
||||||
LOGFS_STRING='log_function_data fs $FUNCNAME "$( echo $@ )"'
|
LOGFS_STRING='log_function_data fs $FUNCNAME "$( echo $@ )"'
|
||||||
LOGFE_STRING='log_function_data fe $FUNCNAME'
|
LOGFE_STRING='log_function_data fe $FUNCNAME'
|
||||||
LOGFS=''
|
LOGFS=''
|
||||||
|
@ -341,17 +341,19 @@ BAN_LIST_CPU=''
|
||||||
main()
|
main()
|
||||||
{
|
{
|
||||||
eval $LOGFS
|
eval $LOGFS
|
||||||
# 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.
|
|
||||||
# This function just initializes variables
|
|
||||||
initialize_script_data
|
|
||||||
|
|
||||||
# Check for dependencies BEFORE running ANYTHING else except above functions
|
# Check for dependencies BEFORE running ANYTHING else except above functions
|
||||||
# Not all distro's have these depends installed by default
|
# Not all distro's have these depends installed by default
|
||||||
check_script_depends
|
check_script_depends
|
||||||
check_script_suggested_apps
|
check_script_suggested_apps
|
||||||
|
|
||||||
|
# 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.
|
||||||
|
# This function just initializes variables
|
||||||
|
initialize_script_data
|
||||||
|
|
||||||
### Only continue if depends ok
|
### Only continue if depends ok
|
||||||
SCRIPT_PATH=$( dirname $0 )
|
SCRIPT_PATH=$( dirname $0 )
|
||||||
SCRIPT_VERSION_NUMBER=$( grep -im 1 'version:' $SCRIPT_PATH/$SCRIPT_NAME | gawk '{print $3}' )
|
SCRIPT_VERSION_NUMBER=$( grep -im 1 'version:' $SCRIPT_PATH/$SCRIPT_NAME | gawk '{print $3}' )
|
||||||
|
@ -1033,7 +1035,7 @@ get_parameters()
|
||||||
@) if [[ -n $( egrep "^([1-9]|10)$" <<< $OPTARG ) ]];then
|
@) if [[ -n $( egrep "^([1-9]|10)$" <<< $OPTARG ) ]];then
|
||||||
DEBUG=$OPTARG
|
DEBUG=$OPTARG
|
||||||
exec 2>&1
|
exec 2>&1
|
||||||
# switch on logging only for -@ 9, 10
|
# switch on logging only for -@ 10
|
||||||
if [[ $OPTARG -ge 9 ]];then
|
if [[ $OPTARG -ge 9 ]];then
|
||||||
if [[ $OPTARG -eq 10 ]];then
|
if [[ $OPTARG -eq 10 ]];then
|
||||||
B_LOG_COLORS='true'
|
B_LOG_COLORS='true'
|
||||||
|
|
Loading…
Reference in a new issue