summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2015-01-29 01:59:53 -0500
committerLuke Shumaker <lukeshu@sbcglobal.net>2015-01-29 01:59:53 -0500
commitb844c786dbb22a45a218e183dcecd58cdbb66025 (patch)
treec2b5ac3dc17500a9aa510755acd6b6f2cdac7b05
parentc9a99ea8e015a34626a524a0e8be3c5378961894 (diff)
fix merge
l---------.config/systemd/user/wmii@.service.wants/rbar@98_wifi.service1
l---------.config/systemd/user/wmii@.service.wants/redshift@.service1
-rwxr-xr-x.config/wmii-hg/rbar_acpi2
3 files changed, 1 insertions, 3 deletions
diff --git a/.config/systemd/user/wmii@.service.wants/rbar@98_wifi.service b/.config/systemd/user/wmii@.service.wants/rbar@98_wifi.service
deleted file mode 120000
index 286989e..0000000
--- a/.config/systemd/user/wmii@.service.wants/rbar@98_wifi.service
+++ /dev/null
@@ -1 +0,0 @@
-../rbar@.service \ No newline at end of file
diff --git a/.config/systemd/user/wmii@.service.wants/redshift@.service b/.config/systemd/user/wmii@.service.wants/redshift@.service
deleted file mode 120000
index 59234a7..0000000
--- a/.config/systemd/user/wmii@.service.wants/redshift@.service
+++ /dev/null
@@ -1 +0,0 @@
-../redshift@.service \ No newline at end of file
diff --git a/.config/wmii-hg/rbar_acpi b/.config/wmii-hg/rbar_acpi
index bdcdf0f..5e77abb 100755
--- a/.config/wmii-hg/rbar_acpi
+++ b/.config/wmii-hg/rbar_acpi
@@ -5,7 +5,7 @@ update() {
setup_trap "${id}.*"
while true; do
- acpi -bt | sed -r \
+ acpi -t | sed -r \
-e 's/^([A-Z])[a-z]+ ([0-9]+):/\1\2:/' \
-e 's/\s*degrees\s*/°/g' |
cat -n | while read -r n line; do