Merge pull request #537 from dylanaraps/args
Args: Fix config bug and remove large case for single regex match
This commit is contained in:
commit
332782a444
1 changed files with 3 additions and 14 deletions
17
neofetch
17
neofetch
|
@ -2704,8 +2704,7 @@ color() {
|
|||
# OTHER
|
||||
|
||||
err() {
|
||||
err+="$(color 1)[!]\033[0m $1
|
||||
"
|
||||
err+="$(color 1)[!]\033[0m $1\n"
|
||||
}
|
||||
|
||||
get_script_dir() {
|
||||
|
@ -3134,17 +3133,7 @@ exit 1
|
|||
|
||||
get_args() {
|
||||
# Check the commandline flags early for '--config none/off'
|
||||
case "$@" in
|
||||
*"--config off"* | *'--config "off"'* | *"--config 'off'"* | \
|
||||
*"--config none"* | *'--config "none"'* | *"--config 'none'"*)
|
||||
config="off"
|
||||
;;
|
||||
|
||||
*"--config -"*) ;;
|
||||
*"--config"*) config="off" ;;
|
||||
esac
|
||||
|
||||
[[ "${config:-on}" == "on" ]] && get_user_config 2>/dev/null
|
||||
[[ "$@" =~ --config\ ?(off|none) ]] || get_user_config 2>/dev/null
|
||||
|
||||
while [[ "$1" ]]; do
|
||||
case "$1" in
|
||||
|
@ -3291,7 +3280,7 @@ get_args() {
|
|||
# Other
|
||||
"--config")
|
||||
case "$2" in
|
||||
"none" | "off") config="off" ;;
|
||||
"none" | "off" | "") config="off" ;;
|
||||
*) config_file="$2"; config="on"; get_user_config 2>/dev/null ;;
|
||||
esac
|
||||
;;
|
||||
|
|
Loading…
Reference in a new issue