From ba7f2a28413e45b1bddd5e71ba40d861a5172308 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20K=C3=B6rber?= <hannes@hkoerber.de>
Date: Sun, 7 Dec 2014 02:00:05 +0100
Subject: [PATCH] Add skel directory, tidy up battery warning script.

---
 git/gitignore_global                |  1 -
 i3/i3/scripts/status.d/battery.bash | 21 +++++++++++++++++----
 skel/.var/lib/mpd/.gitignore        |  0
 skel/.var/log/i3/.gitignore         |  0
 skel/.var/log/mpd/.gitignore        |  0
 skel/.var/run/batwarn/.gitignore    |  0
 skel/.var/run/i3/.gitignore         |  0
 7 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 skel/.var/lib/mpd/.gitignore
 create mode 100644 skel/.var/log/i3/.gitignore
 create mode 100644 skel/.var/log/mpd/.gitignore
 create mode 100644 skel/.var/run/batwarn/.gitignore
 create mode 100644 skel/.var/run/i3/.gitignore

diff --git a/git/gitignore_global b/git/gitignore_global
index fb9d52c..5948fb9 100644
--- a/git/gitignore_global
+++ b/git/gitignore_global
@@ -1,7 +1,6 @@
 # http://github.com/github/gitignore
 
 ### Linux
-.*
 !.gitignore
 *~
 
diff --git a/i3/i3/scripts/status.d/battery.bash b/i3/i3/scripts/status.d/battery.bash
index 70f0528..6b1081b 100755
--- a/i3/i3/scripts/status.d/battery.bash
+++ b/i3/i3/scripts/status.d/battery.bash
@@ -4,10 +4,13 @@
 # creating nice output if you click on the status bar
 # what i done depends on the first paramter
 
-[[ ! -d "$LOGDIR/batwarn" ]] && mkdir -p "$LOGDIR/batwarn"
+rundir="$RUNDIR/batwarn"
+logfile="$LOGDIR/batwarn.log"
 
-PATH_WARN_1="$LOGDIR/batwarn/batwarn1"
-PATH_WARN_2="$LOGDIR/batwarn/batwarn2"
+[[ ! -d "$rundir" ]] && mkdir -p "$rundir"
+
+PATH_WARN_1="$rundir/batwarn1"
+PATH_WARN_2="$rundir/batwarn2"
 
 THRESHOLD1=25
 THRESHOLD2=5
@@ -22,6 +25,11 @@ fi
 time="$(echo "$acpi_output" | cut -d "," -f 3 | cut -d " " -f 2)"
 shortstatus="$(echo $status | cut -c 1)"
 
+log() {
+    echo [$(date +%FT%T)] "$*" >> $logfile
+}
+
+
 pretty() {
     (
     echo "Status:|$status"
@@ -52,11 +60,13 @@ conky() {
     if discharging ; then
         if threshold2 ; then
             if [[ ! -f "$PATH_WARN_2" ]] ; then
+                log "battery fell below $THRESHOLD2 percent. issuing warning."
                 echo > "$PATH_WARN_2"
                 notify-send --icon dialog-warning "Battery below ${THRESHOLD2}%" --expire-time 0
             fi
         elif threshold1 ; then
             if [[ ! -f "$PATH_WARN_1" ]] ; then
+                log "battery fell below $THRESHOLD1 percent. issuing warning."
                 echo > "$PATH_WARN_1"
                 notify-send --icon dialog-warning "Battery below ${THRESHOLD1}%" --expire-time 30000
             fi
@@ -64,7 +74,10 @@ conky() {
     fi
 
     if charging ; then
-        [[ -f "$PATH_WARN_1" ]] && rm "$PATH_WARN_1"
+        if [[ -f "$PATH_WARN_1" ]] ; then
+            log "charging now. resetting warnings."
+            rm "$PATH_WARN_1"
+        fi
         [[ -f "$PATH_WARN_2" ]] && rm "$PATH_WARN_2"
         #if [[ $percent -gt 25 ]] ; then
         #    [[ -f "$PATH_WARN_1" ]] && rm "$PATH_WARN_1"
diff --git a/skel/.var/lib/mpd/.gitignore b/skel/.var/lib/mpd/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/skel/.var/log/i3/.gitignore b/skel/.var/log/i3/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/skel/.var/log/mpd/.gitignore b/skel/.var/log/mpd/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/skel/.var/run/batwarn/.gitignore b/skel/.var/run/batwarn/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/skel/.var/run/i3/.gitignore b/skel/.var/run/i3/.gitignore
new file mode 100644
index 0000000..e69de29