From 89f5fca357934c5967ba1049148b35c3d8c4f10a Mon Sep 17 00:00:00 2001 From: Ryan Kavanagh Date: Sun, 6 May 2012 11:15:50 -0400 Subject: Added toggle for disabling GPG decryption of sensitive files --- SUBSTS | 3 +++ dm | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/SUBSTS b/SUBSTS index f632fa7..90f46c5 100644 --- a/SUBSTS +++ b/SUBSTS @@ -5,6 +5,9 @@ key value # /sbin/sha256 on FreeBSD # /bin/sha256 on OpenBSD SHA256 /sbin/sha256 +# Disable GPG decryption of sensitive files. Must be True to disable, enabled +# for all other values +GPG_DISABLED False # Mail passwords GMAIL_PASS secret QUEENSU_PASS secret diff --git a/dm b/dm index c3f44f4..aed8588 100755 --- a/dm +++ b/dm @@ -70,6 +70,7 @@ 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) +GPG_DISABLED = $(CALL get-val,GPG_DISABLED) VARS_.devscripts = MSMTP_PATH VARS_.gitconfig = MSMTP_PATH @@ -109,7 +110,7 @@ FORCE: # $(patsubst gpg/,,$(wildcard gpg/.* gpg/*)) $(GPG_FILES): touch $@ && chmod 600 $@ - gpg --decrypt gpg/$@.gpg > $@ + [ $(GPG_DISABLED) = "True" ] || gpg --decrypt gpg/$@.gpg > $@ build/%: % $(SUBSTS_FILE) [ -d $(dir $@) ] || mkdir -p $(dir $@) -- cgit v1.2.3