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

misc: fix some lint errors

This commit is contained in:
Dylan Araps 2018-06-01 12:58:23 +10:00
parent 1f7aa76c48
commit c1f0fc9699
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
neofetch
View File

@ -803,8 +803,8 @@ get_os() {
;; ;;
*) *)
printf "%s\n" "Unknown OS detected: '$kernel_name', aborting..." >&2 printf '%s\n' "Unknown OS detected: '$kernel_name', aborting..." >&2
printf "%s\n" "Open an issue on GitHub to add support for your OS." >&2 printf '%s\n' "Open an issue on GitHub to add support for your OS." >&2
exit 1 exit 1
;; ;;
esac esac
@ -2366,7 +2366,7 @@ get_song() {
case "${player/*\/}" in case "${player/*\/}" in
"mpd"* | "mopidy"*) song="$(mpc -f '%artist% \n %album% \n %title%' current)" ;; "mpd"* | "mopidy"*) song="$(mpc -f '%artist% \n %album% \n %title%' current)" ;;
"mocp"*) song="$(mocp -Q "%artist \n %album \n %song")" ;; "mocp"*) song="$(mocp -Q '%artist \n %album \n %song')" ;;
"google play"*) song="$(gpmdp-remote current)" ;; "google play"*) song="$(gpmdp-remote current)" ;;
"rhythmbox"*) song="$(rhythmbox-client --print-playing-format '%ta \n %at \n %tt')" ;; "rhythmbox"*) song="$(rhythmbox-client --print-playing-format '%ta \n %at \n %tt')" ;;
"deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist% \n %album% \n %title%')" ;; "deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist% \n %album% \n %title%')" ;;
@ -3909,7 +3909,7 @@ info() {
prin() { prin() {
# If $2 doesn't exist we format $1 as info. # If $2 doesn't exist we format $1 as info.
if [[ "$(trim "$1")" && "$2" ]]; then if [[ "$(trim "$1")" && "$2" ]]; then
[[ "$json" ]] && { printf " %s\n" "\"${1}\": \"${2}\","; return; } [[ "$json" ]] && { printf ' %s\n' "\"${1}\": \"${2}\","; return; }
string="${1}${2:+: $2}" string="${1}${2:+: $2}"
else else
@ -3977,7 +3977,7 @@ trim() {
set -f set -f
# shellcheck disable=2048,2086 # shellcheck disable=2048,2086
set -- $* set -- $*
printf "%s\\n" "${*//[[:space:]]/ }" printf '%s\n' "${*//[[:space:]]/ }"
set +f set +f
} }
@ -3993,7 +3993,7 @@ strip_sequences() {
strip="${strip//$'\e['38\;5\;[0-9][0-9]m}" strip="${strip//$'\e['38\;5\;[0-9][0-9]m}"
strip="${strip//$'\e['38\;5\;[0-9][0-9][0-9]m}" strip="${strip//$'\e['38\;5\;[0-9][0-9][0-9]m}"
printf "%s\n" "$strip" printf '%s\n' "$strip"
} }
# COLORS # COLORS
@ -4083,7 +4083,7 @@ get_full_path() {
# For example "Pictures/Wallpapers" --> "/home/dylan/Pictures/Wallpapers" # For example "Pictures/Wallpapers" --> "/home/dylan/Pictures/Wallpapers"
# If the file exists in the current directory, stop here. # If the file exists in the current directory, stop here.
[[ -f "${PWD}/${1/*\/}" ]] && { printf "%s\n" "${PWD}/${1/*\/}"; return; } [[ -f "${PWD}/${1/*\/}" ]] && { printf '%s\n' "${PWD}/${1/*\/}"; return; }
! cd "${1%/*}" && { ! cd "${1%/*}" && {
err "Error: Directory '${1%/*}' doesn't exist or is inaccessible" err "Error: Directory '${1%/*}' doesn't exist or is inaccessible"
@ -4103,7 +4103,7 @@ get_full_path() {
# Final directory. # Final directory.
full_dir="$(pwd -P)/${1/*\/}" full_dir="$(pwd -P)/${1/*\/}"
[[ -e "$full_dir" ]] && printf "%s\n" "$full_dir" [[ -e "$full_dir" ]] && printf '%s\n' "$full_dir"
} }
get_user_config() { get_user_config() {
@ -4127,7 +4127,7 @@ get_user_config() {
config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" config_file="${XDG_CONFIG_HOME}/neofetch/config.conf"
# The config file doesn't exist, create it. # The config file doesn't exist, create it.
printf "%s\n" "$config" > "$config_file" printf '%s\n' "$config" > "$config_file"
fi fi
source "$config_file" source "$config_file"
@ -4702,11 +4702,11 @@ get_args() {
;; ;;
"--stdout") stdout="on" ;; "--stdout") stdout="on" ;;
"-v") verbose="on" ;; "-v") verbose="on" ;;
"--print_config") printf "%s\\n" "$config"; exit ;; "--print_config") printf '%s\n' "$config"; exit ;;
"-vv") set -x; verbose="on" ;; "-vv") set -x; verbose="on" ;;
"--help") usage ;; "--help") usage ;;
"--version") "--version")
printf "%s\\n" "Neofetch $version" printf '%s\n' "Neofetch $version"
exit 1 exit 1
;; ;;
"--gen-man") "--gen-man")
@ -4719,10 +4719,10 @@ get_args() {
json="on" json="on"
unset -f get_title get_cols get_line_break get_underline unset -f get_title get_cols get_line_break get_underline
printf "{\n" printf '{\n'
print_info 2>/dev/null print_info 2>/dev/null
printf " %s\n" "\"Version\": \"${version}\"" printf ' %s\n' "\"Version\": \"${version}\""
printf "}\n" printf '}\n'
exit exit
;; ;;