moved some running in shell assignments to main()

This commit is contained in:
inxi-svn 2011-07-09 00:18:49 +00:00
parent 552fb8f1b9
commit 4e4244e620

17
inxi
View file

@ -624,11 +624,17 @@ main()
set_color_scheme $color_scheme
fi
fi
# too hard to read if no colors, so force that for users on irc
if [[ $B_RUNNING_IN_SHELL == 'true' || $SCHEME == 0 ]];then
if [[ $B_RUNNING_IN_SHELL == 'true' ]];then
LINE_MAX=$LINE_MAX_CONSOLE
SEP3=$SEP3_CONSOLE
else
SEP3=$SEP3_IRC
# too hard to read if no colors, so force that for users on irc
if [[ $SCHEME == 0 ]];then
SEP3=$SEP3_CONSOLE
else
SEP3=$SEP3_IRC
fi
LINE_MAX=$LINE_MAX_IRC
fi
# all the pre-start stuff is in place now
@ -2545,11 +2551,6 @@ get_start_client()
unset IRC_CLIENT_VERSION
fi
fi
if [[ $B_RUNNING_IN_SHELL == 'true' ]];then
LINE_MAX=$LINE_MAX_CONSOLE
else
LINE_MAX=$LINE_MAX_IRC
fi
log_function_data "IRC_CLIENT: $IRC_CLIENT :: IRC_CLIENT_VERSION: $IRC_CLIENT_VERSION :: PPID: $PPID"
eval $LOGFE