diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-09-03 20:15:56 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-09-03 20:15:56 -0400 |
| commit | df589b66081b888321b19cfcdea0531271820153 (patch) | |
| tree | 4bef0ab203ca432049192bcd3c215806523426f2 | |
| parent | e038ffc1843d417174ade379742e57cfd63806ab (diff) | |
| parent | ad5c8c7f2f7ea08579692f55fd4e2faac62ba6f7 (diff) | |
Merge branch 'master' into hp-dv6426us-par
| -rw-r--r-- | .bash_logout | 2 | ||||
| -rw-r--r-- | .maildirproc/default.rc | 16 | ||||
| -rwxr-xr-x | .wmii/wmiirc | 5 |
3 files changed, 19 insertions, 4 deletions
diff --git a/.bash_logout b/.bash_logout index 5ca7df0..a8b88c1 100644 --- a/.bash_logout +++ b/.bash_logout @@ -6,4 +6,4 @@ if [ "$SHLVL" = 1 ]; then [ -x /usr/bin/clear_console ] && /usr/bin/clear_console -q fi -alsactl --file $HOME/.alsa.save store +make -C "$HOME" diff --git a/.maildirproc/default.rc b/.maildirproc/default.rc index 24f51e8..65ba8c6 100644 --- a/.maildirproc/default.rc +++ b/.maildirproc/default.rc @@ -102,6 +102,10 @@ def my_filters(mail): mail.move(".software.parabola-dev") return + if (mail["List-Id"].matches("pacman-dev@archlinux.org")): + mail.move(".software.pacman-dev") + return + for subject_re in [ "\[Stow-[^\]]*\].*", ]: @@ -148,6 +152,7 @@ def my_filters(mail): or is_to_or_from(mail,"eldredmac@comcast.net")# MacDonell or is_to_or_from(mail,"mitchprather@sbcglobal.net") or is_to_or_from(mail,"oa_wap@yahoo.com") + or is_to_or_from(mail,"mytroop.us") ): mail.move(".Troop276") return @@ -157,6 +162,14 @@ def my_filters(mail): mail.move(".misc.Mom") return + if address in [ + "justicejade10@aol.com", + "parsonsjade@aol.com", + ]: + if mail["From"].contains(address): + mail.move(".misc.Jade") + return + for address in [ "nintendo.com", "nintendo-news.com", @@ -190,7 +203,6 @@ def my_filters(mail): "@usfirst.org", "gamefreak207@gmail.com", # Brett Leedy "tswilson4801@att.net", - "justicejade10@aol.com", "silioso@gmail.com", "cdewalt3@yahoo.com", "bryanbonahoom@gmail.com", @@ -221,6 +233,8 @@ def my_filters(mail): "canonical.org", "foocorp.net", "cnuk.org", + "@archlinux.org", + "@github.com", ]: if is_to_or_from(mail,address): mail.move(".software") diff --git a/.wmii/wmiirc b/.wmii/wmiirc index 82c424b..92adb8b 100755 --- a/.wmii/wmiirc +++ b/.wmii/wmiirc @@ -47,7 +47,8 @@ Event() { # might complain about /etc/mtab if the x server has already stopped fusermount -u "$WMII_DIR" 2>>/dev/null echo " -> rmdir'ing WMII_DIR=$WMII_DIR..." - rmdir "$WMII_DIR";; + rmdir "$WMII_DIR" + exit;; Warning) ## $@=string notify-send "wmii warning: $*";; Key) ## $1=keystroke @@ -226,7 +227,7 @@ Key() { sel=$(sed 1q $WMII_DIR/client/sel/ctl) { tag=$(lstags | wimenu -h "${hist}.tags" -n 50) || return - wmiir xwrite /client/$sel/tags $tag + wmiir xwrite /client/$sel/tags "$tag" }& ;; esac } ## End Key |