Misc fixes

This commit is contained in:
Dylan 2016-05-15 09:28:08 +10:00
parent 2565f7c659
commit 3d467ff678
1 changed files with 5 additions and 11 deletions

View File

@ -824,7 +824,7 @@ getwm () {
else else
case "$os" in case "$os" in
"Mac OS X") wm="Quartz Compositor" ;; "Mac OS X") wm="Quartz Compositor" ;;
"Windows") wm="Explorer" ;; "Windows") wm="Explorer" ;;
esac esac
fi fi
} }
@ -933,7 +933,6 @@ getwmtheme () {
wmtheme="$(head -n1 "$path" 2>/dev/null)" wmtheme="$(head -n1 "$path" 2>/dev/null)"
wmtheme="${wmtheme##*\\}" wmtheme="${wmtheme##*\\}"
wmtheme="${wmtheme%.*}" wmtheme="${wmtheme%.*}"
wmtheme="${wmtheme^}"
;; ;;
esac esac
@ -1143,8 +1142,8 @@ getcpu () {
cpu=${cpu//Processor} cpu=${cpu//Processor}
cpu=${cpu//Six-Core} cpu=${cpu//Six-Core}
cpu=${cpu//Eight-Core} cpu=${cpu//Eight-Core}
cpu=${cpu/Dual-Core} cpu=${cpu//Dual-Core}
cpu=${cpu/Quad-Core} cpu=${cpu//Quad-Core}
cpu=${cpu//with Radeon HD Graphics} cpu=${cpu//with Radeon HD Graphics}
# Add cpu cores to output # Add cpu cores to output
@ -1153,13 +1152,8 @@ getcpu () {
# Make the output of cpu shorter # Make the output of cpu shorter
case "$cpu_shorthand" in case "$cpu_shorthand" in
"name") "name") cpu=${cpu/@*} ;;
cpu=${cpu/@*} "speed") cpu=${cpu#*@ } ;;
;;
"speed")
cpu=${cpu#*@ }
;;
"on" | "tiny") "on" | "tiny")
cpu=${cpu/Intel } cpu=${cpu/Intel }