1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 04:27:43 +00:00

Ports: Use "ini" in neofetch to read theme name

This commit is contained in:
Linus Groh 2020-07-11 22:42:07 +01:00 committed by Andreas Kling
parent 8afbf89380
commit fa98dcc05d

View file

@ -1,5 +1,5 @@
--- neofetch-7.0.0/neofetch 2020-04-27 15:12:00.884771680 +0100 --- neofetch-7.0.0/neofetch 2020-03-08 10:23:36.000000000 +0000
+++ neofetch-7.0.0/neofetch 2020-04-27 20:10:22.265079042 +0100 +++ neofetch-7.0.0/neofetch 2020-07-11 22:28:44.926009278 +0100
@@ -775,7 +775,7 @@ @@ -775,7 +775,7 @@
# PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, # PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian,
# Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, # Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata,
@ -139,25 +139,21 @@
esac esac
[[ "$memory_percent" == "on" ]] && ((mem_perc=mem_used * 100 / mem_total)) [[ "$memory_percent" == "on" ]] && ((mem_perc=mem_used * 100 / mem_total))
@@ -3027,6 +3059,17 @@ @@ -3027,6 +3059,13 @@
theme="${theme/ '[Plasma]'}" theme="${theme/ '[Plasma]'}"
fi fi
fi fi
+ +
+ if [[ "$os" == "SerenityOS" ]]; then + if [[ "$os" == "SerenityOS" ]]; then
+ theme="Default" + theme=$(ini /etc/WindowServer/WindowServer.ini Theme Name)
+ # This will stop working if there's another "Name" key! + if [ -z "$theme" ]; then
+ # We somehow need to check if the current section is "[Theme]". + theme="Default"
+ while IFS="=" read -r a b; do + fi
+ case $a in
+ $serenity) theme="${b}" ;;
+ esac
+ done < /etc/WindowServer/WindowServer.ini
+ fi + fi
} }
get_theme() { get_theme() {
@@ -3035,6 +3078,7 @@ @@ -3035,6 +3074,7 @@
gconf="gtk_theme" gconf="gtk_theme"
xfconf="/Net/ThemeName" xfconf="/Net/ThemeName"
kde="Name" kde="Name"
@ -165,7 +161,7 @@
get_style get_style
} }
@@ -3045,6 +3089,7 @@ @@ -3045,6 +3085,7 @@
gconf="icon_theme" gconf="icon_theme"
xfconf="/Net/IconThemeName" xfconf="/Net/IconThemeName"
kde="Theme" kde="Theme"
@ -173,7 +169,7 @@
get_style get_style
icons="$theme" icons="$theme"
@@ -3074,6 +3119,8 @@ @@ -3074,6 +3115,8 @@
*) term="${TERM_PROGRAM/\.app}" ;; *) term="${TERM_PROGRAM/\.app}" ;;
esac esac
@ -182,7 +178,7 @@
# Most likely TosWin2 on FreeMiNT - quick check # Most likely TosWin2 on FreeMiNT - quick check
[[ "$TERM" == "tw52" || "$TERM" == "tw100" ]] && term="TosWin2" [[ "$TERM" == "tw52" || "$TERM" == "tw100" ]] && term="TosWin2"
[[ "$SSH_CONNECTION" ]] && term="$SSH_TTY" [[ "$SSH_CONNECTION" ]] && term="$SSH_TTY"
@@ -3637,10 +3684,10 @@ @@ -3637,10 +3680,10 @@
} }
get_public_ip() { get_public_ip() {
@ -197,7 +193,7 @@
if [[ -z "$public_ip" ]] && type -p drill >/dev/null; then if [[ -z "$public_ip" ]] && type -p drill >/dev/null; then
public_ip="$(drill myip.opendns.com @resolver1.opendns.com | \ public_ip="$(drill myip.opendns.com @resolver1.opendns.com | \
@@ -3785,13 +3832,13 @@ @@ -3785,13 +3828,13 @@
} }
print_ascii() { print_ascii() {
@ -218,7 +214,7 @@
# Set locale to get correct padding. # Set locale to get correct padding.
LC_ALL="$sys_locale" LC_ALL="$sys_locale"
@@ -4549,8 +4596,8 @@ @@ -4549,8 +4592,8 @@
padding=${xrdb/*internalBorder:} padding=${xrdb/*internalBorder:}
padding=${padding/$'\n'*} padding=${padding/$'\n'*}
@ -229,7 +225,7 @@
;; ;;
esac esac
} }
@@ -4834,7 +4881,7 @@ @@ -4834,7 +4877,7 @@
PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian,
Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata,
Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor,
@ -238,7 +234,7 @@
Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap,
openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel,
Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, Ubuntu, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, Ubuntu,
@@ -9097,6 +9144,34 @@ @@ -9097,6 +9140,34 @@
EOF EOF
;; ;;