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

Merge pull request #583 from dylanaraps/mathfix 

DE: Fix bugs.
This commit is contained in:
Dylan Araps 2017-01-02 12:00:23 +11:00 committed by GitHub
parent c948f185f9 315dfc1ef0
commit dfdc9977bd
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
neofetch
View File

@ -524,7 +524,7 @@ get_shell() {
get_de() { get_de() {
# If function was run, stop here. # If function was run, stop here.
(( "$de_run" == 1 )) && return ((de_run == 1)) && return
case "$os" in case "$os" in
"Mac OS X") de="Aqua" ;; "Mac OS X") de="Aqua" ;;
@ -536,10 +536,10 @@ get_de() {
;; ;;
*) *)
(( "$wm_run" != 1 )) && get_wm ((wm_run != 1)) && get_wm
if [[ "$XDG_CURRENT_DESKTOP" ]]; then if [[ "$XDG_CURRENT_DESKTOP" ]]; then
de="${de/'X-'}" de="${XDG_CURRENT_DESKTOP/'X-'}"
de="${de/Budgie:GNOME/Budgie}" de="${de/Budgie:GNOME/Budgie}"
elif [[ "$DESKTOP_SESSION" ]]; then elif [[ "$DESKTOP_SESSION" ]]; then
@ -556,7 +556,7 @@ get_de() {
# the desktop variables are sometimes also set to the # the desktop variables are sometimes also set to the
# window manager name. This checks to see if WM == DE # window manager name. This checks to see if WM == DE
# and dicards the DE value. # and dicards the DE value.
[[ "$de" =~ $wm ]] && { unset -v de; return; } [[ "$wm" && "$de" =~ $wm ]] && { unset -v de; return; }
;; ;;
esac esac
@ -581,7 +581,7 @@ get_de() {
get_wm() { get_wm() {
# If function was run, stop here. # If function was run, stop here.
(( "$wm_run" == 1 )) && return ((wm_run == 1)) && return
if [[ -n "$DISPLAY" && "$os" != "Mac OS X" ]]; then if [[ -n "$DISPLAY" && "$os" != "Mac OS X" ]]; then
id="$(xprop -root -notype | awk '$1=="_NET_SUPPORTING_WM_CHECK:"{print $5}')" id="$(xprop -root -notype | awk '$1=="_NET_SUPPORTING_WM_CHECK:"{print $5}')"
@ -610,8 +610,8 @@ get_wm() {
} }
get_wm_theme() { get_wm_theme() {
(( "$wm_run" != 1 )) && get_wm ((wm_run != 1)) && get_wm
(( "$de_run" != 1 )) && get_de ((de_run != 1)) && get_de
case "$wm" in case "$wm" in
"E16") wm_theme="$(awk -F "= " '/theme.name/ {print $2}' "${HOME}/.e16/e_config--0.0.cfg")";; "E16") wm_theme="$(awk -F "= " '/theme.name/ {print $2}' "${HOME}/.e16/e_config--0.0.cfg")";;
@ -1345,7 +1345,7 @@ get_style() {
if [[ -n "$DISPLAY" && "$os" != "Mac OS X" ]]; then if [[ -n "$DISPLAY" && "$os" != "Mac OS X" ]]; then
# Get DE if user has disabled the function. # Get DE if user has disabled the function.
(( "$de_run" != 1 )) && get_de ((de_run != 1)) && get_de
# Check for DE Theme. # Check for DE Theme.
case "$de" in case "$de" in
@ -1502,7 +1502,7 @@ get_font() {
get_term() { get_term() {
# If function was run, stop here. # If function was run, stop here.
(( "$term_run" == 1 )) && return ((term_run == 1)) && return
# Workaround for macOS systems that # Workaround for macOS systems that
# don't support the block below. # don't support the block below.
@ -1532,7 +1532,7 @@ get_term() {
} }
get_term_font() { get_term_font() {
(( "$term_run" != 1 )) && get_term ((term_run != 1)) && get_term
case "$term" in case "$term" in
"urxvt" | "urxvtd" | "xterm") "urxvt" | "urxvtd" | "xterm")
@ -2021,7 +2021,7 @@ get_wallpaper() {
case "$os" in case "$os" in
"Linux" | "BSD" | "Solaris" | "MINIX") "Linux" | "BSD" | "Solaris" | "MINIX")
# Get DE if user has disabled the function. # Get DE if user has disabled the function.
(( "$de_run" != 1 )) && get_de ((de_run != 1)) && get_de
case "$de" in case "$de" in
"MATE"*) image="$(gsettings get org.mate.background picture-filename)" ;; "MATE"*) image="$(gsettings get org.mate.background picture-filename)" ;;
@ -2928,7 +2928,7 @@ get_term_padding() {
# #
# Note: This issue only seems to affect # Note: This issue only seems to affect
# URxvt. # URxvt.
(( "$term_run" != 1 )) && get_term ((term_run != 1)) && get_term
case "$term" in case "$term" in
"URxvt"*) "URxvt"*)