kforney/hyfetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

general: revert change.

Browse source
This commit is contained in:
Dylan Araps 2018-10-17 14:51:14 +11:00
parent 1278844d87
commit 6bb5a78f92
1 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
neofetch
View file

@ -1136,7 +1136,7 @@ get_model() {
case "$model" in case "$model" in
"Standard PC"*) model="KVM/QEMU (${model})" ;; "Standard PC"*) model="KVM/QEMU (${model})" ;;
"OpenBSD"*) model="vmm (${model})" ;; "OpenBSD"*) model="vmm ($model)" ;;
esac esac
} }
@ -1476,8 +1476,8 @@ get_wm() {
((wm_run == 1)) && return ((wm_run == 1)) && return
case "$uname" in case "$uname" in
*"OpenBSD"*) ps_flags=(x -c) ;; *"OpenBSD"*) ps_flags=(x -c) ;;
*) ps_flags=(-e) ;; *) ps_flags=(-e) ;;
esac esac
if [[ "$WAYLAND_DISPLAY" ]]; then if [[ "$WAYLAND_DISPLAY" ]]; then
@ -3088,19 +3088,9 @@ get_disk() {
# Create an array called 'disks' where each element is a separate line from # Create an array called 'disks' where each element is a separate line from
# df's output. We then unset the first element which removes the column titles. # df's output. We then unset the first element which removes the column titles.
if [[ "$uname" == "OpenBSD" ]]; then IFS=$'\n' read -d "" -ra disks <<< "$(df "${df_flags[@]}" "${disk_show[@]:-/}")"
# On OpenBSD you can't use df against a /dev/... unless being root or unset "disks[0]"
# in the 'operator' group. Making a separate disks array creation.
# building an AWK regexp
disk_re="${disk_show[*]:-/}"
disk_re="${disk_re// /\|}"
disk_re="^(${disk_re//\//\\\/})\$"
IFS=$'\n' read -d "" -ra disks <<< "$(df "${df_flags[@]}" | \
awk -v disk_re="$disk_re" '(NR > 1) && ($1 ~ disk_re || $6 ~ disk_re)')"
else
IFS=$'\n' read -d "" -ra disks <<< "$(df "${df_flags[@]}" "${disk_show[@]:-/}")"
unset "disks[0]"
fi
# Stop here if 'df' fails to print disk info. # Stop here if 'df' fails to print disk info.
[[ -z "${disks[*]}" ]] && { [[ -z "${disks[*]}" ]] && {
err "Disk: df failed to print the disks, make sure the disk_show array is set properly." err "Disk: df failed to print the disks, make sure the disk_show array is set properly."