summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Fleischer <lfleischer@archlinux.org>2015-06-02 10:48:31 +0200
committerLukas Fleischer <lfleischer@archlinux.org>2015-06-02 10:49:33 +0200
commit124ad009975eb9dfed8141f24fccf12fdc720346 (patch)
tree6ac20eb06f5a89c50182afcf42ad56e70585d1f0
parent10ecd3982decc31bda251ec73d00d6a903a75f9f (diff)
downloadaur-124ad009975eb9dfed8141f24fccf12fdc720346.tar.gz
aur-124ad009975eb9dfed8141f24fccf12fdc720346.tar.xz
Add a Makefile for the git-auth wrapper
Avoid manual editing of the wrapper script when a non-standard path is used. Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>
-rw-r--r--INSTALL3
-rw-r--r--git-interface/Makefile18
-rw-r--r--git-interface/config.mk1
-rwxr-xr-xgit-interface/git-auth.sh3
-rw-r--r--git-interface/git-auth.sh.in3
5 files changed, 23 insertions, 5 deletions
diff --git a/INSTALL b/INSTALL
index 3aad5156..a2a6153f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -34,8 +34,7 @@ Setup on Arch Linux
7) Install the git-auth wrapper script:
# cd /srv/http/aurweb/git-interface/
- # cp git-auth.sh /usr/local/bin/aur-git-auth
- # chmod 755 /usr/local/bin/aur-git-auth
+ # make && make install
8) Configure sshd(8) for the AUR. Add the following lines at the end of your
sshd_config(5) and restart the sshd. Note that OpenSSH 6.9 or newer is
diff --git a/git-interface/Makefile b/git-interface/Makefile
new file mode 100644
index 00000000..88657904
--- /dev/null
+++ b/git-interface/Makefile
@@ -0,0 +1,18 @@
+GIT_INTERFACE_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
+
+include config.mk
+
+git-auth.sh:
+ sed 's#%GIT_INTERFACE_DIR%#$(GIT_INTERFACE_DIR)#' <git-auth.sh.in >git-auth.sh
+ chmod +x git-auth.sh
+
+install: git-auth.sh
+ install -Dm0755 git-auth.sh "$(DESTDIR)$(PREFIX)/bin/aur-git-auth"
+
+uninstall:
+ rm -f "$(DESTDIR)$(PREFIX)/bin/aur-git-auth"
+
+clean:
+ rm -f git-auth.sh
+
+.PHONY: install uninstall clean
diff --git a/git-interface/config.mk b/git-interface/config.mk
new file mode 100644
index 00000000..4d794a1c
--- /dev/null
+++ b/git-interface/config.mk
@@ -0,0 +1 @@
+PREFIX = /usr/local
diff --git a/git-interface/git-auth.sh b/git-interface/git-auth.sh
deleted file mode 100755
index a5caeec4..00000000
--- a/git-interface/git-auth.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-/srv/http/aurweb/git-interface/git-auth.py "$1" "$2"
diff --git a/git-interface/git-auth.sh.in b/git-interface/git-auth.sh.in
new file mode 100644
index 00000000..223816ac
--- /dev/null
+++ b/git-interface/git-auth.sh.in
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+%GIT_INTERFACE_DIR%/git-auth.py "$1" "$2"