diff options
| -rwxr-xr-x | .dzen/dzen.sh | 2 | ||||
| -rw-r--r-- | .screenrc | 2 | ||||
| -rw-r--r-- | SUBSTS | 3 | ||||
| -rwxr-xr-x | bin/run-mailcheck | 2 | ||||
| -rwxr-xr-x | dm | 9 |
5 files changed, 15 insertions, 3 deletions
diff --git a/.dzen/dzen.sh b/.dzen/dzen.sh index 59c4700..0d2b8e4 100755 --- a/.dzen/dzen.sh +++ b/.dzen/dzen.sh @@ -1,4 +1,4 @@ -#!/bin/zsh +#!/bin/sh typeset -A DISKS ### @@ -1,5 +1,5 @@ defutf8 on -shell /bin/zsh +shell ZSH_PATH encoding UTF-8 vbell on defnonblock 5 @@ -25,3 +25,6 @@ SUBSTS_LS ls # path to msmtp MSMTP_PATH /usr/bin/msmtp + +# path to zsh +ZSH_PATH /bin/zsh diff --git a/bin/run-mailcheck b/bin/run-mailcheck index 215aaf7..9859570 100755 --- a/bin/run-mailcheck +++ b/bin/run-mailcheck @@ -1,4 +1,4 @@ -#!/bin/zsh +#!/bin/sh MAIL=`mailcheck` GMAIL=`echo $MAIL | /bin/grep -v QueensU` QUEENSU=`echo $MAIL | /bin/grep QueensU` @@ -4,11 +4,14 @@ SUBSTS_FILE=SUBSTS.local # Files that need changes to work locally or that contain sensitive # information LOCAL_FILES = \ + .gitconfig \ .imapfilter/config.lua \ .msmtprc \ + .muttrc \ .mutt/accounts.rc \ .netrc \ .offlineimaprc \ + .screenrc \ .xmonad/xmonad.hs \ .zshrc \ @@ -59,6 +62,8 @@ XMONAD_DZEN_X = $(call get-val,XMONAD_DZEN_X) XMONAD_DZEN_Y = $(call get-val,XMONAD_DZEN_Y) LOCALE = $(call get-val,LOCALE) SUBSTS_LS = $(call get-val,SUBSTS_LS) +MSMTP_PATH = $(call get-val,MSMTP_PATH) +ZSH_PATH = $(call get-val,ZSH_PATH) # This target relies on GLOBAL_FILES being before LOCAL_FILES so that the # build/LOCAL_FILES targets overwrite what was copied in GLOBAL_FILES. @@ -101,6 +106,10 @@ build/.mutt/accounts.rc: .mutt/accounts.rc $(SUBSTS_FILE) -e 's/QUEENSU_PASS/$(QUEENSU_PASS)/g' \ -e 's/MSMTP_PATH/$(MSMTP_PATH)/g' $< > $@ +build/.screenrc: .screenrc $(SUBSTS_FILE) + [ -d $(dir $@) ] || mkdir $(dir $@) + sed -e 's/ZSH_PATH/$(ZSH_PATH)/g' $< > $@ + build/.xinitrc: .xinitrc $(SUBSTS_FILE) [ -d build ] || mkdir build sed -e 's/SCREENLAYOUT/$(SCREENLAYOUT)/g' $< > $@ |