From 9bf9a7fb3227b8037678d42f3dd6e46071255fab Mon Sep 17 00:00:00 2001
From: Bill Evans <BillEvans@ActiveDecisionSupport.com>
Date: Wed, 5 Feb 2020 13:40:20 -0800
Subject: [PATCH 1/4] use "standard" posix directory variables

- https://github.com/dspinellis/git-issue/issues/64#issuecomment-582281134
- https://www.gnu.org/software/make/manual/html_node/Directory-Variables.html
- https://www.gnu.org/software/automake/manual/html_node/Standard-Directory-Variables.html
---
 Makefile     | 32 ++++++++++++++++----------------
 git-issue.sh |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index 8b4aaae..fdb2810 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,20 @@
-PREFIX ?= /usr/local
-BINPREFIX ?= "$(PREFIX)/bin"
-LIBPREFIX ?= "$(PREFIX)/lib"
-MANPREFIX ?= "$(PREFIX)/share/man/man1"
-SYSCONFDIR ?= $(PREFIX)/etc
+prefix      := /usr/local
+exec_prefix := $(prefix)
+bindir      := $(exec_prefix)/bin
+libexecdir  := $(exec_prefix)/libexec
+sysconfdir  := $(prefix)/etc
+datarootdir := $(prefix)/share
+mandir      := $(datarootdir)/man
+man1dir     := $(mandir)/man1
 
 default: install
 
 install:
-	@mkdir -p $(DESTDIR)$(MANPREFIX)
-	@mkdir -p $(DESTDIR)$(BINPREFIX)
-	@mkdir -p $(DESTDIR)$(LIBPREFIX)/git-issue
-	install git-issue.sh $(DESTDIR)$(BINPREFIX)/git-issue
-	install lib/git-issue/import-export.sh $(DESTDIR)$(LIBPREFIX)/git-issue/import-export.sh
-	install -m 644 git-issue.1 $(DESTDIR)$(MANPREFIX)/
-	@mkdir -p $(DESTDIR)$(SYSCONFDIR)/bash_completion.d
-	install -m 644 gi-completion.sh $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/git-issue
+	mkdir -p "$(bindir)" "$(libexecdir)/git-issue" "$(sysconfdir)/bash_completion.d" "$(man1dir)"
+	install git-issue.sh $(bindir)/git-issue
+	install lib/git-issue/import-export.sh $(libexecdir)/git-issue/import-export.sh
+	install -m 644 git-issue.1 $(man1dir)/
+	install -m 644 gi-completion.sh $(sysconfdir)/bash_completion.d/git-issue
 
 # Synchronize man page and usage with the contents of the README file
 sync-docs:
@@ -29,9 +29,9 @@ test:
 	./test.sh
 
 uninstall:
-	rm -f $(DESTDIR)$(BINPREFIX)/git-issue
-	rm -f $(DESTDIR)$(MANPREFIX)/git-issue.
-	rm -f $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/git-issue
+	rm -f $(bindir)/git-issue
+	rm -f $(man1dir)/git-issue.
+	rm -f $(sysconfdir)/bash_completion.d/git-issue
 
 clean:
 
diff --git a/git-issue.sh b/git-issue.sh
index d32bc2f..ac2ece9 100755
--- a/git-issue.sh
+++ b/git-issue.sh
@@ -36,7 +36,7 @@ IFS=:
 # Set library path
 # shellcheck disable=SC2086
 # Rationale: Word splitting not an issue
-LIB_PATH="$(dirname $0)/../lib:$LD_LIBRARY_PATH:/usr/local/lib:/usr/lib"
+LIB_PATH="$(dirname $0)/../libexec:$LD_LIBRARY_PATH:/usr/local/libexec:/usr/libexec"
 if [ "x$GIT_ISSUE_LIB_PATH" != x ] ; then
   LIB_PATH="$GIT_ISSUE_LIB_PATH"
 fi

From 8949f8d4a82a86e7e7d67225d92a8ed7c1206533 Mon Sep 17 00:00:00 2001
From: Bill Evans <BillEvans@ActiveDecisionSupport.com>
Date: Wed, 5 Feb 2020 14:14:23 -0800
Subject: [PATCH 2/4] hard-code libexecdir/git-issue, trim the LIB_PATH search

---
 git-issue.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/git-issue.sh b/git-issue.sh
index ac2ece9..ee3ea2d 100755
--- a/git-issue.sh
+++ b/git-issue.sh
@@ -36,13 +36,13 @@ IFS=:
 # Set library path
 # shellcheck disable=SC2086
 # Rationale: Word splitting not an issue
-LIB_PATH="$(dirname $0)/../libexec:$LD_LIBRARY_PATH:/usr/local/libexec:/usr/libexec"
+LIB_PATH="$(dirname $0)/../libexec/git-issue:$LD_LIBRARY_PATH:/usr/local/libexec/git-issue:/usr/libexec/git-issue"
 if [ "x$GIT_ISSUE_LIB_PATH" != x ] ; then
   LIB_PATH="$GIT_ISSUE_LIB_PATH"
 fi
 for i in ${LIB_PATH} ; do
-  if [ -d "${i}/git-issue" ] ; then
-    MY_LIB="${i}/git-issue"
+  if [ -d "${i}" -a -f "${i}/import-export.sh" ] ; then
+    MY_LIB="${i}"
     break
   fi
 done

From 4b195ff642e0e555d6ba7ab863adde2b88c02ae4 Mon Sep 17 00:00:00 2001
From: Bill Evans <BillEvans@ActiveDecisionSupport.com>
Date: Wed, 5 Feb 2020 14:30:05 -0800
Subject: [PATCH 3/4] really fix the LIB_PATH this time

---
 git-issue.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-issue.sh b/git-issue.sh
index ee3ea2d..e85a955 100755
--- a/git-issue.sh
+++ b/git-issue.sh
@@ -36,7 +36,7 @@ IFS=:
 # Set library path
 # shellcheck disable=SC2086
 # Rationale: Word splitting not an issue
-LIB_PATH="$(dirname $0)/../libexec/git-issue:$LD_LIBRARY_PATH:/usr/local/libexec/git-issue:/usr/libexec/git-issue"
+LIB_PATH="/usr/local/libexec/git-issue:$(dirname $0)/../libexec/git-issue:$(dirname $0)/../lib/git-issue"
 if [ "x$GIT_ISSUE_LIB_PATH" != x ] ; then
   LIB_PATH="$GIT_ISSUE_LIB_PATH"
 fi

From 2870f4fa3d9b324011ba8c6780085731ee5060ad Mon Sep 17 00:00:00 2001
From: Bill Evans <BillEvans@ActiveDecisionSupport.com>
Date: Wed, 5 Feb 2020 14:38:05 -0800
Subject: [PATCH 4/4] fix SC2166

[SC2166](https://github.com/koalaman/shellcheck/wiki/SC2166)
incompletely written, but essentially:

`test aa -a bb` is obsolete (not 'not well defined')
---
 git-issue.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-issue.sh b/git-issue.sh
index e85a955..a35baae 100755
--- a/git-issue.sh
+++ b/git-issue.sh
@@ -41,7 +41,7 @@ if [ "x$GIT_ISSUE_LIB_PATH" != x ] ; then
   LIB_PATH="$GIT_ISSUE_LIB_PATH"
 fi
 for i in ${LIB_PATH} ; do
-  if [ -d "${i}" -a -f "${i}/import-export.sh" ] ; then
+  if [ -d "${i}" ] && [ -f "${i}/import-export.sh" ] ; then
     MY_LIB="${i}"
     break
   fi