Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
neofetch
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ximper Linux
neofetch
Commits
415ef5d4
Commit
415ef5d4
authored
Jan 09, 2019
by
Dylan Araps
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
misc: Quote all the things
parent
acc8103d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
30 additions
and
39 deletions
+30
-39
neofetch
neofetch
+30
-39
No files found.
neofetch
View file @
415ef5d4
...
@@ -76,7 +76,7 @@ print_info() {
...
@@ -76,7 +76,7 @@ print_info() {
# info "Battery" battery
# info "Battery" battery
# info "Font" font
# info "Font" font
# info "Song" song
# info "Song" song
# [[
$player
]] && prin "Music Player" "$player"
# [[
"$player"
]] && prin "Music Player" "$player"
# info "Local IP" local_ip
# info "Local IP" local_ip
# info "Public IP" public_ip
# info "Public IP" public_ip
# info "Users" users
# info "Users" users
...
@@ -849,7 +849,7 @@ get_distro() {
...
@@ -849,7 +849,7 @@ get_distro() {
case "$os" in
case "$os" in
"Linux" | "BSD" | "MINIX")
"Linux" | "BSD" | "MINIX")
if [[ -f
/bedrock/etc/bedrock-release && $PATH
== */bedrock/cross/* ]]; then
if [[ -f
"/bedrock/etc/bedrock-release" && "$PATH"
== */bedrock/cross/* ]]; then
case "$distro_shorthand" in
case "$distro_shorthand" in
"on" | "tiny") distro="Bedrock Linux" ;;
"on" | "tiny") distro="Bedrock Linux" ;;
*) distro="$(< /bedrock/etc/bedrock-release)"
*) distro="$(< /bedrock/etc/bedrock-release)"
...
@@ -906,7 +906,7 @@ get_distro() {
...
@@ -906,7 +906,7 @@ get_distro() {
# Chrome OS doesn't conform to the /etc/*-release standard.
# Chrome OS doesn't conform to the /etc/*-release standard.
# While the file is a series of variables they can't be sourced
# While the file is a series of variables they can't be sourced
# by the shell since the values aren't quoted.
# by the shell since the values aren't quoted.
elif [[ -f
/etc/lsb-release
&& "$(< /etc/lsb-release)" == *CHROMEOS* ]]; then
elif [[ -f
"/etc/lsb-release"
&& "$(< /etc/lsb-release)" == *CHROMEOS* ]]; then
distro="$(awk -F '=' '/NAME|VERSION/ {printf $2 " "}' /etc/lsb-release)"
distro="$(awk -F '=' '/NAME|VERSION/ {printf $2 " "}' /etc/lsb-release)"
elif [[ -f "/etc/os-release" || \
elif [[ -f "/etc/os-release" || \
...
@@ -938,7 +938,7 @@ get_distro() {
...
@@ -938,7 +938,7 @@ get_distro() {
distro="${distro/DragonFly/DragonFlyBSD}"
distro="${distro/DragonFly/DragonFlyBSD}"
# Workarounds for FreeBSD based distros.
# Workarounds for FreeBSD based distros.
[[ -f "/etc/pcbsd-lang" ]] && distro="PCBSD"
[[ -f "/etc/pcbsd-lang" ]] &&
distro="PCBSD"
[[ -f "/etc/trueos-lang" ]] && distro="TrueOS"
[[ -f "/etc/trueos-lang" ]] && distro="TrueOS"
# /etc/pacbsd-release is an empty file
# /etc/pacbsd-release is an empty file
...
@@ -946,15 +946,14 @@ get_distro() {
...
@@ -946,15 +946,14 @@ get_distro() {
fi
fi
fi
fi
if [[ "$(< /proc/version)" == *"Microsoft"* ||
if [[ "$(< /proc/version)" == *Microsoft* || "$kernel_version" == *Microsoft* ]]; then
"$kernel_version" == *"Microsoft"* ]]; then
case "$distro_shorthand" in
case "$distro_shorthand" in
"on") distro+=" [Windows 10]" ;;
"on") distro+=" [Windows 10]" ;;
"tiny") distro="Windows 10" ;;
"tiny") distro="Windows 10" ;;
*) distro+=" on Windows 10" ;;
*) distro+=" on Windows 10" ;;
esac
esac
elif [[ "$(< /proc/version)" == *
"chrome-bot"
* || -f "/dev/cros_ec" ]]; then
elif [[ "$(< /proc/version)" == *
chrome-bot
* || -f "/dev/cros_ec" ]]; then
case "$distro_shorthand" in
case "$distro_shorthand" in
"on") distro+=" [Chrome OS]" ;;
"on") distro+=" [Chrome OS]" ;;
"tiny") distro="Chrome OS" ;;
"tiny") distro="Chrome OS" ;;
...
@@ -1059,15 +1058,15 @@ get_model() {
...
@@ -1059,15 +1058,15 @@ get_model() {
if [[ -d "/system/app/" && -d "/system/priv-app" ]]; then
if [[ -d "/system/app/" && -d "/system/priv-app" ]]; then
model="$(getprop ro.product.brand) $(getprop ro.product.model)"
model="$(getprop ro.product.brand) $(getprop ro.product.model)"
elif [[ -f
/sys/devices/virtual/dmi/id/product_name
||
elif [[ -f
"/sys/devices/virtual/dmi/id/product_name"
||
-f
/sys/devices/virtual/dmi/id/product_version
]]; then
-f
"/sys/devices/virtual/dmi/id/product_version"
]]; then
model="$(< /sys/devices/virtual/dmi/id/product_name)"
model="$(< /sys/devices/virtual/dmi/id/product_name)"
model+=" $(< /sys/devices/virtual/dmi/id/product_version)"
model+=" $(< /sys/devices/virtual/dmi/id/product_version)"
elif [[ -f
/sys/firmware/devicetree/base/model
]]; then
elif [[ -f
"/sys/firmware/devicetree/base/model"
]]; then
model="$(< /sys/firmware/devicetree/base/model)"
model="$(< /sys/firmware/devicetree/base/model)"
elif [[ -f
/tmp/sysinfo/model
]]; then
elif [[ -f
"/tmp/sysinfo/model"
]]; then
model="$(< /tmp/sysinfo/model)"
model="$(< /tmp/sysinfo/model)"
fi
fi
;;
;;
...
@@ -1293,7 +1292,7 @@ get_packages() {
...
@@ -1293,7 +1292,7 @@ get_packages() {
tot() { IFS=$'\n' read -d "" -ra pkgs < <("$@");((packages+="${#pkgs[@]}"));pac "${#pkgs[@]}"; }
tot() { IFS=$'\n' read -d "" -ra pkgs < <("$@");((packages+="${#pkgs[@]}"));pac "${#pkgs[@]}"; }
# Redefine tot() for Bedrock Linux.
# Redefine tot() for Bedrock Linux.
[[ -f
/bedrock/etc/bedrock-release && $PATH
== */bedrock/cross/* ]] && {
[[ -f
"/bedrock/etc/bedrock-release" && "$PATH"
== */bedrock/cross/* ]] && {
tot() {
tot() {
IFS=$'\n' read -d "" -ra pkgs < <(for s in $(brl list); do strat -r "$s" "$@"; done)
IFS=$'\n' read -d "" -ra pkgs < <(for s in $(brl list); do strat -r "$s" "$@"; done)
((packages+="${#pkgs[@]}"))
((packages+="${#pkgs[@]}"))
...
@@ -1839,8 +1838,7 @@ get_cpu() {
...
@@ -1839,8 +1838,7 @@ get_cpu() {
fi
fi
# Get CPU temp.
# Get CPU temp.
[[ -f "$temp_dir" ]] && \
[[ -f "$temp_dir" ]] && deg="$(($(< "$temp_dir") * 100 / 10000))"
deg="$(($(< "$temp_dir") * 100 / 10000))"
# Get CPU cores.
# Get CPU cores.
case "$cpu_cores" in
case "$cpu_cores" in
...
@@ -2103,9 +2101,7 @@ get_gpu() {
...
@@ -2103,9 +2101,7 @@ get_gpu() {
# Checking the first two array elements should
# Checking the first two array elements should
# be safe since there won't be 2 intel outputs if
# be safe since there won't be 2 intel outputs if
# there's a dedicated GPU in play.
# there's a dedicated GPU in play.
[[ "${gpus[0]}" == *Intel* && \
[[ "${gpus[0]}" == *Intel* && "${gpus[1]}" == *Intel* ]] && unset -v "gpus[0]"
"${gpus[1]}" == *Intel* ]] && \
unset -v "gpus[0]"
for gpu in "${gpus[@]}"; do
for gpu in "${gpus[@]}"; do
# GPU shorthand tests.
# GPU shorthand tests.
...
@@ -2355,7 +2351,7 @@ get_memory() {
...
@@ -2355,7 +2351,7 @@ get_memory() {
esac
esac
[[
$memory_percent == on
]] && ((mem_perc=mem_used * 100 / mem_total))
[[
"$memory_percent" == "on"
]] && ((mem_perc=mem_used * 100 / mem_total))
memory="${mem_used}${mem_label:-MiB} / ${mem_total}${mem_label:-MiB} ${mem_perc:+(${mem_perc}%)}"
memory="${mem_used}${mem_label:-MiB} / ${mem_total}${mem_label:-MiB} ${mem_perc:+(${mem_perc}%)}"
...
@@ -2409,8 +2405,7 @@ get_song() {
...
@@ -2409,8 +2405,7 @@ get_song() {
player="$(ps aux | awk -v pattern="(${players:1})" \
player="$(ps aux | awk -v pattern="(${players:1})" \
'!/ awk / && !/iTunesHelper/ && match($0,pattern){print substr($0,RSTART,RLENGTH); exit}')"
'!/ awk / && !/iTunesHelper/ && match($0,pattern){print substr($0,RSTART,RLENGTH); exit}')"
[[ "$music_player" && "$music_player" != "auto" ]] && \
[[ "$music_player" && "$music_player" != "auto" ]] && player="$music_player"
player="$music_player"
get_song_dbus() {
get_song_dbus() {
# Multiple players use an almost identical dbus command to get the information.
# Multiple players use an almost identical dbus command to get the information.
...
@@ -2618,7 +2613,7 @@ get_resolution() {
...
@@ -2618,7 +2613,7 @@ get_resolution() {
esac
esac
resolution="${resolution%,*}"
resolution="${resolution%,*}"
[[ -z
${resolution/x}
]] && resolution=
[[ -z
"${resolution/x}"
]] && resolution=
}
}
get_style() {
get_style() {
...
@@ -2797,11 +2792,8 @@ get_term() {
...
@@ -2797,11 +2792,8 @@ get_term() {
esac
esac
# Most likely TosWin2 on FreeMiNT - quick check
# Most likely TosWin2 on FreeMiNT - quick check
[[ "$TERM" == "tw52" || "$TERM" == "tw100" ]] && \
[[ "$TERM" == "tw52" || "$TERM" == "tw100" ]] && term="TosWin2"
term="TosWin2"
[[ "$SSH_CONNECTION" ]] && term="$SSH_TTY"
[[ "$SSH_CONNECTION" ]] && \
term="$SSH_TTY"
# Check $PPID for terminal emulator.
# Check $PPID for terminal emulator.
while [[ -z "$term" ]]; do
while [[ -z "$term" ]]; do
...
@@ -2921,7 +2913,7 @@ END
...
@@ -2921,7 +2913,7 @@ END
"kitty"*)
"kitty"*)
kitty_config="$(kitty --debug-config)"
kitty_config="$(kitty --debug-config)"
[[
$kitty_config
!= *font_family* ]] && return
[[
"$kitty_config"
!= *font_family* ]] && return
term_font_size="${kitty_config/*font_size}"
term_font_size="${kitty_config/*font_size}"
term_font_size="${term_font_size/$'\n'*}"
term_font_size="${term_font_size/$'\n'*}"
...
@@ -2967,7 +2959,7 @@ END
...
@@ -2967,7 +2959,7 @@ END
mateterm_config="/tmp/mateterm.cfg"
mateterm_config="/tmp/mateterm.cfg"
# Ensure /tmp exists and we do not overwrite anything.
# Ensure /tmp exists and we do not overwrite anything.
if [[ -d
/tmp
&& ! -f "$mateterm_config" ]]; then
if [[ -d
"/tmp"
&& ! -f "$mateterm_config" ]]; then
mate-terminal --save-config="$mateterm_config"
mate-terminal --save-config="$mateterm_config"
role="$(xprop -id "${WINDOWID}" WM_WINDOW_ROLE)"
role="$(xprop -id "${WINDOWID}" WM_WINDOW_ROLE)"
...
@@ -3032,7 +3024,7 @@ END
...
@@ -3032,7 +3024,7 @@ END
# On Linux we can get the exact path to the running binary through the procfs
# On Linux we can get the exact path to the running binary through the procfs
# (in case `st` is launched from outside of $PATH) on other systems we just
# (in case `st` is launched from outside of $PATH) on other systems we just
# have to guess and assume `st` is invoked from somewhere in the users $PATH
# have to guess and assume `st` is invoked from somewhere in the users $PATH
[[ -L
/proc/$parent/exe
]] && binary="/proc/$parent/exe" || binary="$(type -p st)"
[[ -L
"/proc/$parent/exe"
]] && binary="/proc/$parent/exe" || binary="$(type -p st)"
# Grep the output of strings on the `st` binary for anything that looks vaguely
# Grep the output of strings on the `st` binary for anything that looks vaguely
# like a font definition. NOTE: There is a slight limitation in this approach.
# like a font definition. NOTE: There is a slight limitation in this approach.
...
@@ -3085,8 +3077,7 @@ END
...
@@ -3085,8 +3077,7 @@ END
term_font="$(trim "${term_font/*"faceName:"}")"
term_font="$(trim "${term_font/*"faceName:"}")"
# xft: isn't required at the beginning so we prepend it if it's missing
# xft: isn't required at the beginning so we prepend it if it's missing
[[ "${term_font:0:1}" != "-" && \
[[ "${term_font:0:1}" != "-" && "${term_font:0:4}" != "xft:" ]] && \
"${term_font:0:4}" != "xft:" ]] && \
term_font="xft:$term_font"
term_font="xft:$term_font"
# Xresources has two different font formats, this checks which
# Xresources has two different font formats, this checks which
...
@@ -3454,9 +3445,9 @@ image_backend() {
...
@@ -3454,9 +3445,9 @@ image_backend() {
}
}
print_ascii() {
print_ascii() {
if [[ -f
$image_source && ! $image_source
=~ (png|jpg|jpeg|jpe|svg|gif) ]]; then
if [[ -f
"$image_source" && ! "$image_source"
=~ (png|jpg|jpeg|jpe|svg|gif) ]]; then
ascii_data="$(< "$image_source")"
ascii_data="$(< "$image_source")"
elif [[
$image_source == ascii
|| $image_source == auto ]]; then
elif [[
"$image_source" == "ascii"
|| $image_source == auto ]]; then
:
:
else
else
ascii_data="$image_source"
ascii_data="$image_source"
...
@@ -3732,7 +3723,7 @@ get_image_size() {
...
@@ -3732,7 +3723,7 @@ get_image_size() {
esac
esac
# Check for terminal padding.
# Check for terminal padding.
[[
$image_backend == w3m
]] && term_padding
[[
"$image_backend" == "w3m"
]] && term_padding
width="${width:-$image_size}"
width="${width:-$image_size}"
height="${height:-$image_size}"
height="${height:-$image_size}"
...
@@ -4201,7 +4192,7 @@ kde_config_dir() {
...
@@ -4201,7 +4192,7 @@ kde_config_dir() {
term_padding() {
term_padding() {
# Get terminal padding to properly align cursor.
# Get terminal padding to properly align cursor.
[[ -z
$term
]] && get_term
[[ -z
"$term"
]] && get_term
case "$term" in
case "$term" in
urxvt*|"rxvt-unicode")
urxvt*|"rxvt-unicode")
...
@@ -4213,9 +4204,9 @@ term_padding() {
...
@@ -4213,9 +4204,9 @@ term_padding() {
}
}
dynamic_prompt() {
dynamic_prompt() {
[[
$image_backend == off
]] && { printf '\n'; return; }
[[
"$image_backend" == "off"
]] && { printf '\n'; return; }
[[
$image_backend != ascii
]] && ((lines=(height + yoffset) / font_height + 1))
[[
"$image_backend" != "ascii"
]] && ((lines=(height + yoffset) / font_height + 1))
[[
$image_backend == w3m ]]
&& ((lines=lines + padding / font_height + 1))
[[
"$image_backend" == "w3m" ]]
&& ((lines=lines + padding / font_height + 1))
# If the ascii art is taller than the info.
# If the ascii art is taller than the info.
((lines=lines>info_height?lines-info_height+1:1))
((lines=lines>info_height?lines-info_height+1:1))
...
@@ -4771,7 +4762,7 @@ get_args() {
...
@@ -4771,7 +4762,7 @@ get_args() {
get_simple() {
get_simple() {
while [[ "$1" ]]; do
while [[ "$1" ]]; do
[[
$(type -t "get_$1") == function
]] && {
[[
"$(type -t "get_$1")" == "function"
]] && {
get_distro
get_distro
stdout
stdout
simple=1
simple=1
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment