aboutsummaryrefslogtreecommitdiff
path: root/dm
diff options
context:
space:
mode:
authorRyan Kavanagh <ryanakca@kubuntu.org>2011-08-25 07:40:38 -0400
committerRyan Kavanagh <ryanakca@kubuntu.org>2011-08-25 07:57:30 -0400
commited546af4311b1add41d361576f637bc3284cb17a (patch)
treedb5aa67902d7f77d7b7e7752d0fbf4e60f9f77ab /dm
parentDon't include us in keymap/icd, we get a whole bunch of duplicate symbols (diff)
Call get-val from get-sed-args
Diffstat (limited to '')
-rwxr-xr-xdm18
1 files changed, 1 insertions, 17 deletions
diff --git a/dm b/dm
index bac39ee..3baa71f 100755
--- a/dm
+++ b/dm
@@ -53,28 +53,12 @@ GLOBAL_FILES = \
bin/ \
get-val = $(shell awk '{if (match($$0, /$1/)) { print $$2 } }' $(SUBSTS_FILE))
-get-sed-args = $(foreach var,$($(1)),-e 's|$(var)|$($(var))|g')
+get-sed-args = $(foreach var,$($(1)),-e 's|$(var)|$(call get-val,$(var))|g')
CURRENT_BRANCH = $(shell git branch --no-color | colrm 1 2)
SHA256 = $(call get-val,SHA256)
-LOCAL_PASS = $(call get-val,LOCAL_PASS)
-GMAIL_PASS = $(call get-val,GMAIL_PASS)
-QUEENSU_PASS = $(call get-val,QUEENSU_PASS)
-PM_EMAIL = $(call get-val,PM_EMAIL)
-SCREENLAYOUT = $(call get-val,SCREENLAYOUT)
-XMONAD_DZEN_W = $(call get-val,XMONAD_DZEN_W)
-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)
-ZSH_HOST_COLOUR = $(call get-val,ZSH_HOST_COLOUR)
-SCREEN_HOST_COLOUR = $(call get-val,SCREEN_HOST_COLOUR)
-SUBSTS_RM = $(call get-val,SUBSTS_RM)
-
VARS_.devscripts = MSMTP_PATH
VARS_.gitconfig = MSMTP_PATH
VARS_.imapfilter/config.lua = LOCAL_PASS PM_EMAIL