Import CMU SCS student aliases

5 files changed, 11 insertions, 3 deletions

diff --git a/.gitignore b/.gitignore
index 935f021..1c85f08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ build
 SUBSTS.local
 SUBSTS.merged
 .mutt/alias.rc
+.mutt/alias-cmu.rc
 .ssh/id_rsa
 .ssh/id_ecdsa
 .ssh/id_rsa.lambda
diff --git a/.muttrc b/.muttrc
index ede346b..dcf9959 100644
--- a/.muttrc
+++ b/.muttrc
@@ -112,6 +112,7 @@ unignore X-Label:
 
 set mbox_type=mbox
 
+source ~/.mutt/alias-cmu.rc
 source ~/.mutt/alias.rc
 source ~/.mutt/mailinglists.rc
 source ~/.mutt/score.rc
diff --git a/Makefile b/Makefile
index 2f602c7..be94eb5 100755
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,8 @@ LOCAL_FILES = \
 
 # GPG encrypted files
 GPG_FILES = \
-    .mutt/alias.rc
+    .mutt/alias.rc \
+    .mutt/alias-cmu.rc
 
 # Files that are system independent.
 # IMPORTANT: directories must have trailing slash
@@ -55,6 +56,7 @@ GLOBAL_FILES = \
     .mailcheckrc \
     .mutt/ \
     .mutt/alias.rc \
+    .mutt/alias-cmu.rc \
     .muttrc \
     .notmuch-config \
     .offlineimap.py \
@@ -136,11 +138,15 @@ build/.zsh/func/prompt_wunjo_setup: FORCE
 FORCE:
 
 .mutt/alias.rc: gpg/.mutt/alias.rc.gpg
+.mutt/alias-cmu.rc: gpg/.mutt/alias-cmu.rc.gpg
 .ssh/id_%: gpg/.ssh/id_%.gpg
 # $(patsubst gpg/,,$(wildcard gpg/.* gpg/*))
 $(GPG_FILES):
-	touch $@ && chmod 600 $@
-	[ "$(GPG_DISABLED)" = "True" ] || $(GPG_BINARY) --decrypt gpg/$@.gpg > $@
+	for f in $@ ; do \
+	    touch $$f; \
+	    chmod 600 $$f; \
+	    [ "$(GPG_DISABLED)" = "True" ] || echo $(GPG_BINARY) --decrypt gpg/$$f.gpg > $$f; \
+	done
 
 emacsen:
 	[ "$(EMACS_DISABLED)" = "True" ] || $(MAKE) -C $@
diff --git a/gpg/.mutt/alias-cmu.rc.gpg b/gpg/.mutt/alias-cmu.rc.gpg
new file mode 100644
index 0000000..d36c101
--- /dev/null
+++ b/gpg/.mutt/alias-cmu.rc.gpg
diff --git a/gpg/.mutt/alias.rc.gpg b/gpg/.mutt/alias.rc.gpg
index bffb254..391fa4d 100644
--- a/gpg/.mutt/alias.rc.gpg
+++ b/gpg/.mutt/alias.rc.gpg