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

Merge pull request #351 from dylanaraps/arg-fix

Browse source 
Fix issues with "-*" args.
This commit is contained in:
Dylan Araps 2016-10-04 08:48:30 +11:00 committed by GitHub
commit 2c7cb70daa
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
neofetch
View file

@ -2869,7 +2869,7 @@ dynamicprompt() {
scrot_args() { scrot_args() {
scrot="on" scrot="on"
case "$2" in case "$2" in
"--"* | "") ;; "-"* | "") ;;
*) *)
scrot_name="${2##*/}" scrot_name="${2##*/}"
scrot_dir="${2/$scrot_name}" scrot_dir="${2/$scrot_name}"
@ -3018,7 +3018,7 @@ getargs() {
config="off" config="off"
;; ;;
*"--config --"*) ;; *"--config -"*) ;;
*"--config"*) config="off" ;; *"--config"*) config="off" ;;
esac esac
@ -3055,7 +3055,7 @@ getargs() {
for func in "$@"; do for func in "$@"; do
case "$func" in case "$func" in
"--disable") continue ;; "--disable") continue ;;
"--"*) return ;; "-"*) return ;;
*) unset -f "get$func" ;; *) unset -f "get$func" ;;
esac esac
done done
@ -3066,7 +3066,7 @@ getargs() {
unset colors unset colors
for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do
case "$arg" in case "$arg" in
"--"*) break ;; "-"*) break ;;
*) colors+=($arg) *) colors+=($arg)
esac esac
done done
@ -3103,7 +3103,7 @@ getargs() {
# Image # Image
--image) --image)
image="$2" image="$2"
case "$2" in "--"* | "") image="ascii" ;; esac case "$2" in "-"* | "") image="ascii" ;; esac
;; ;;
--image_size | --size) image_size="$2" ;; --image_size | --size) image_size="$2" ;;
@ -3122,14 +3122,14 @@ getargs() {
--ascii) --ascii)
image="ascii" image="ascii"
ascii="$2" ascii="$2"
case "$2" in "--"* | "") ascii="distro" ;; esac case "$2" in "-"* | "") ascii="distro" ;; esac
;; ;;
--ascii_colors) --ascii_colors)
unset ascii_colors unset ascii_colors
for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do
case "$arg" in case "$arg" in
"--"*) break ;; "-"*) break ;;
*) ascii_colors+=($arg) *) ascii_colors+=($arg)
esac esac
done done
@ -3138,7 +3138,7 @@ getargs() {
--ascii_distro) --ascii_distro)
ascii_distro="$2" ascii_distro="$2"
case "$2" in "--"* | "") ascii_distro="$distro" ;; esac case "$2" in "-"* | "") ascii_distro="$distro" ;; esac
;; ;;
--ascii_logo_size) ascii_logo_size="$2" ;; --ascii_logo_size) ascii_logo_size="$2" ;;