at master 1.8 kB view raw
1diff --git a/Makefile b/Makefile 2index eac2291..1b1df0a 100644 3--- a/Makefile 4+++ b/Makefile 5@@ -46,12 +46,12 @@ install: install-common 6 @install -v -d "$(DESTDIR)$(LIBDIR)/password-store" && install -m 0644 -v "$(PLATFORMFILE)" "$(DESTDIR)$(LIBDIR)/password-store/platform.sh" 7 @install -v -d "$(DESTDIR)$(LIBDIR)/password-store/extensions" 8 @install -v -d "$(DESTDIR)$(BINDIR)/" 9- @trap 'rm -f src/.pass' EXIT; sed 's:.*PLATFORM_FUNCTION_FILE.*:source "$(LIBDIR)/password-store/platform.sh":;s:^SYSTEM_EXTENSION_DIR=.*:SYSTEM_EXTENSION_DIR="$(LIBDIR)/password-store/extensions":' src/password-store.sh > src/.pass && \ 10+ @trap 'rm -f src/.pass' EXIT; sed 's:.*PLATFORM_FUNCTION_FILE.*:source "$(LIBDIR)/password-store/platform.sh":;' src/password-store.sh > src/.pass && \ 11 install -v -d "$(DESTDIR)$(BINDIR)/" && install -m 0755 -v src/.pass "$(DESTDIR)$(BINDIR)/pass" 12 else 13 install: install-common 14 @install -v -d "$(DESTDIR)$(LIBDIR)/password-store/extensions" 15- @trap 'rm -f src/.pass' EXIT; sed '/PLATFORM_FUNCTION_FILE/d;s:^SYSTEM_EXTENSION_DIR=.*:SYSTEM_EXTENSION_DIR="$(LIBDIR)/password-store/extensions":' src/password-store.sh > src/.pass && \ 16+ @trap 'rm -f src/.pass' EXIT; sed '/PLATFORM_FUNCTION_FILE/d;' src/password-store.sh > src/.pass && \ 17 install -v -d "$(DESTDIR)$(BINDIR)/" && install -m 0755 -v src/.pass "$(DESTDIR)$(BINDIR)/pass" 18 endif 19 20diff --git a/src/password-store.sh b/src/password-store.sh 21index 68551a4..2f3b5b7 100755 22--- a/src/password-store.sh 23+++ b/src/password-store.sh 24@@ -656,7 +656,7 @@ cmd_extension_or_show() { 25 fi 26 } 27 28-SYSTEM_EXTENSION_DIR="" 29+SYSTEM_EXTENSION_DIR="${SYSTEM_EXTENSION_DIR:-@out@/lib/password-store/extensions}" 30 cmd_extension() { 31 check_sneaky_paths "$1" 32 local user_extension system_extension extension