password-store

commit 18933a2db9015d2acd669ac879521e02caed0bba
parent 78098bab96c0228d700978492152ba3c2a872d2b
Author: Jason A. Donenfeld <Jason@zx2c4.com>
Date:   Sat, 19 Apr 2014 23:50:42 +0200

platform: Auto-detect local platform file

In fact, if we're running from the source directory, just auto-detect
the platform file in the first place.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

Diffstat:
M
Makefile
 | 
4
++--
M
src/password-store.sh
 | 
2
+-

2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
@@ -26,12 +26,12 @@ ifneq ($(strip $(wildcard $(PLATFORMFILE))),)
 install: install-common
 	@install -m 0644 -v "$(PLATFORMFILE)" "$(DESTDIR)$(LIBDIR)/password-store.platform.sh"
 	@mkdir -p -v "$(DESTDIR)$(BINDIR)/"
-	sed 's:.*PASSWORD_STORE_PLATFORM_FILE.*:source "$(DESTDIR)$(LIBDIR)/password-store.platform.sh":' src/password-store.sh > "$(DESTDIR)$(BINDIR)/pass"
+	sed 's:.*PLATFORM_FUNCTION_FILE.*:source "$(DESTDIR)$(LIBDIR)/password-store.platform.sh":' src/password-store.sh > "$(DESTDIR)$(BINDIR)/pass"
 	@chmod 0755 "$(DESTDIR)$(BINDIR)/pass"
 else
 install: install-common
 	@mkdir -p -v "$(DESTDIR)$(BINDIR)/"
-	sed '/PASSWORD_STORE_PLATFORM_FILE/d' src/password-store.sh > "$(DESTDIR)$(BINDIR)/pass"
+	sed '/PLATFORM_FUNCTION_FILE/d' src/password-store.sh > "$(DESTDIR)$(BINDIR)/pass"
 	@chmod 0755 "$(DESTDIR)$(BINDIR)/pass"
 endif
 
diff --git a/src/password-store.sh b/src/password-store.sh
@@ -177,7 +177,7 @@ tmpdir() {
 GETOPT="getopt"
 SHRED="shred -f -z"
 
-source "$PASSWORD_STORE_PLATFORM_FILE" 2>/dev/null
+source "$(dirname "$0")/platform/$(uname | cut -d _ -f 1 | tr '[:upper:]' '[:lower:]').sh" 2>/dev/null # PLATFORM_FUNCTION_FILE
 
 #
 # END platform definable