Merge pull request #5 from ArcticVanguard/master

Test for user-defined $WM variable
This commit is contained in:
jsch committed 2015-11-15 16:43:07 -06:00
commit ae7c3f37e6
2 files changed
+6 -2

No files matched your search

+3 -1
View File
@@ -12,7 +12,9 @@ KERNEL="$(uname -sr)"
UPTIME="$(uptime -p | sed s:"up "::)" UPTIME="$(uptime -p | sed s:"up "::)"
PACKAGES="$(pacman -Q | wc -l)" PACKAGES="$(pacman -Q | wc -l)"
# shell is already defined # shell is already defined
WM="$(grep -v "^#" "${HOME}/.xinitrc" | tail -n 1 | cut -d " " -f2)" if [[ -z "$WM" ]]; then
WM="$(grep -v "^#" "${HOME}/.xinitrc" | tail -n 1 | cut -d " " -f2)"
fi
## DEFINE COLORS ## DEFINE COLORS
+3 -1
View File
@@ -12,7 +12,9 @@ KERNEL="$(uname -sr)"
UPTIME="$(uptime -p | sed s:'up ':'':)" UPTIME="$(uptime -p | sed s:'up ':'':)"
PACKAGES="$(ls -d /var/db/pkg/*/* | wc -l)" PACKAGES="$(ls -d /var/db/pkg/*/* | wc -l)"
# shell is already defined # shell is already defined
WM=$(tail -n 1 "$HOME/.xinitrc" | cut -d ' ' -f3) if [[ -z "$WM" ]]; then
WM=$(tail -n 1 "$HOME/.xinitrc" | cut -d ' ' -f3)
fi
## DEFINE COLORS ## DEFINE COLORS