Skip to content

use "standard" posix directory variables #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

use "standard" posix directory variables #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9bf9a7f
use "standard" posix directory variables
Feb 5, 2020
8949f8d
hard-code libexecdir/git-issue, trim the LIB_PATH search
Feb 5, 2020
4b195ff
really fix the LIB_PATH this time
Feb 5, 2020
2870f4f
fix SC2166
Feb 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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:

Expand Down
6 changes: 3 additions & 3 deletions git-issue.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ 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="/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
for i in ${LIB_PATH} ; do
if [ -d "${i}/git-issue" ] ; then
MY_LIB="${i}/git-issue"
if [ -d "${i}" ] && [ -f "${i}/import-export.sh" ] ; then
MY_LIB="${i}"
break
fi
done
Expand Down