luisgulo/neofetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #537 from dylanaraps/args

Browse source 
Args: Fix config bug and remove large case for single regex match
This commit is contained in:
Dylan Araps 2016-12-16 13:25:24 +11:00 committed by GitHub
commit 332782a444
1 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
neofetch
View file

@ -2704,8 +2704,7 @@ color() {
# OTHER # OTHER
err() { err() {
err+="$(color 1)[!]\033[0m $1 err+="$(color 1)[!]\033[0m $1\n"
"
} }
get_script_dir() { get_script_dir() {
@ -3134,17 +3133,7 @@ exit 1
get_args() { get_args() {
# Check the commandline flags early for '--config none/off' # Check the commandline flags early for '--config none/off'
case "$@" in [[ "$@" =~ --config\ ?(off|none) ]] || get_user_config 2>/dev/null
*"--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
while [[ "$1" ]]; do while [[ "$1" ]]; do
case "$1" in case "$1" in
@ -3291,7 +3280,7 @@ get_args() {
# Other # Other
"--config") "--config")
case "$2" in case "$2" in
"none" | "off") config="off" ;; "none" | "off" | "") config="off" ;;
*) config_file="$2"; config="on"; get_user_config 2>/dev/null ;; *) config_file="$2"; config="on"; get_user_config 2>/dev/null ;;
esac esac
;; ;;