EvolutionOS
/
neofetch
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #88 from dylanaraps/stdout 

Cleanup 'stdout' functions
This commit is contained in:
Dylan Araps 2016-02-20 00:21:34 +11:00
parent 60027c04b0 0143724f6d
commit 6f115b3c19
3 changed files with 20 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
1.3.md
View File

@ -16,3 +16,6 @@ is now calculated by fetch.
**Song**<br \>
- Added `song_shorthand` which prints the Artist/Title on seperate lines.
**Theme**<br\>
- Windows Visual Style is now a part of `getstyle`.

16
config/config
View File

@ -342,20 +342,4 @@ config="on"
config_file="$HOME/.config/fetch/config"
# }}}
# Other Options {{{
# Separator to use in stdout mode.
# --stdout_separator string
stdout_separator=" "
# Hide/Show the title in stdout mode.
# --stdout_title on/off
stdout_title="off"
# Hide/Show each info's subtitle in stdout mode.
# --stdout_subtitles on/off
stdout_subtitles="on"
# }}}

88
fetch
View File

@ -360,22 +360,6 @@ config="on"
config_file="$HOME/.config/fetch/config"
# }}}
# Other Options {{{
# Separator to use in stdout mode.
# --stdout_separator string
stdout_separator=" "
# Hide/Show the title in stdout mode.
# --stdout_title on/off
stdout_title="off"
# Hide/Show each info's subtitle in stdout mode.
# --stdout_subtitles on/off
stdout_subtitles="on"
# }}}
@ -2053,11 +2037,6 @@ info () {
string="${bold}${title_color}${output}"
string="${string/@/${at_color}@${title_color}}"
length=${#output}
# Hide the title in stdout mode
[ "$stdout" == "on" ] && \
[ "$stdout_title" == "off" ] &&\
string=""
;;
underline)
@ -2075,22 +2054,7 @@ info () {
[ -z "$2" ] && string=${string/*: }
# Print the string
if [ "$stdout" == "on" ]; then
# Unset the vars containg escape codes as lemonbar doesn't
# support them.
unset -v bold subtitle_color clear colon_color info_color \
underline_color title_color at_color
# Show/Hide subtitles
[ "$stdout_subtitles" == "off" ] && string=${string/*: }
# If the string isn't empty, print it.
[ ! -z "$string" ] && printf "%s" "${string}${stdout_separator}"
else
printf "%b%s\n" "${padding}${string}${clear}"
fi
printf "%b%s\n" "${padding}${string}${clear}"
}
# }}}
@ -2115,11 +2079,7 @@ prin () {
esac
# Print the info
if [ "$stdout" == "on" ]; then
printf "%s" "${string}${stdout_separator}"
else
printf "%b%s\n" "${padding}${string}${clear}"
fi
printf "%b%s\n" "${padding}${string}${clear}"
}
# }}}
@ -2127,21 +2087,17 @@ prin () {
# Stdout {{{
stdout () {
printinfo () {
index=1
for func in "${args[@]}"; do
case "$func" in
"--stdout") continue ;;
"--"*) break ;;
*)
case "${args[$((index + 1))]}" in "--"*) unset stdout_separator ;; esac
info "$func"
;;
esac
index=$((index + 1))
done
}
for func in "${args[@]}"; do
case "$func" in
"--"*) break ;;
*)
"get$func" 2>/dev/null
eval output="\$$func"
printf "$output "
;;
esac
done
exit
}
# }}}
@ -2366,9 +2322,6 @@ usage () { cat << EOF
--stdout info info Launch fetch in stdout mode which prints the info
in a plain-text format that you can use with
lemonbar etc.
--stdout_title on/off Hide/Show the title in stdout mode.
--stdout_separator string String to use as a separator in stdout mode.
--stdout_subtitles on/off Hide/Show the subtitles in stdout mode.
Screenshot:
@ -2490,19 +2443,12 @@ while [ "$1" ]; do
--scrot_cmd) scrot_cmd="$2" ;;
# Stdout
--stdout_title) stdout_title="$2" ;;
--stdout_separator) stdout_separator="$2" ;;
--stdout_subtitles) stdout_subtitles="$2" ;;
--stdout)
case "$2" in
"--"* | "") stdout="on" ;;
*) stdout="on"; args=("$@"); stdout ;;
esac
unset info_color colors
underline="off"
image="off"
color_blocks="off"
case "$2" in
"--"* | "") echo "--stdout requires at least one argument"; exit ;;
*) shift; args=("$@"); stdout ;;
esac
;;
# Other