aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2014-04-19 23:50:42 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2014-04-19 23:50:42 +0200
commit18933a2db9015d2acd669ac879521e02caed0bba (patch)
treefcbcbdb881201f4984bcf96499c3af0c0ef137d9
parentplatform: Allow custom platform file before install (diff)
downloadpassword-store-18933a2db9015d2acd669ac879521e02caed0bba.tar.xz
password-store-18933a2db9015d2acd669ac879521e02caed0bba.zip
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>
-rw-r--r--Makefile4
-rwxr-xr-xsrc/password-store.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index ed81e82..6cfa9e4 100644
--- 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
index e350c46..0679942 100755
--- 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