Makefile: add install target

Add an install-from-source target to the 'Makefile' to allow installation on
any Unix-based system, rather than only those for which packages are built
(i.e., Darwin and Debian). This is done by repurposing the 'layout-unix.sh' script into an 'install.sh' script. Like the 'uninstall.sh' update from the previous commit, the new script contains only a few major differences from 'layout-unix.sh':

- The '--payload' option is renamed to '--install-root'.
- Like 'uninstall.sh', commands that may require root privileges (such as
  when '--install-root=/') are wrapped in a 'retry_root' function that first
  runs the operation as the calling user, then as root if it fails. However,
  unlike 'uninstall.sh', this behavior is gated by an '--allow-root' option,
  ensuring we only do this escalation if we're running the 'install' target.
- 'INSTALL_TO' is renamed to 'APP_ROOT' to avoid confusion with
  'INSTALL_ROOT'. This is also done in the pkg 'postinstall' script.

Signed-off-by: Victoria Dye <[email protected]>

Author: vdye

Makefile

@@ -6,6 +6,9 @@ NAME := git-bundle-server
 VERSION :=
 PACKAGE_REVISION := 1
 
+# Installation information
+INSTALL_ROOT := /
+
 # Helpful paths
 BINDIR := $(CURDIR)/bin
 DISTDIR := $(CURDIR)/_dist
@@ -25,6 +28,17 @@ build:
 	@mkdir -p $(BINDIR)
 	GOOS="$(GOOS)" GOARCH="$(GOARCH)" go build -o $(BINDIR) ./...
 
+# Installation targets
+.PHONY: install
+install: build
+	@echo
+	@echo "======== Installing to $(INSTALL_ROOT) ========"
+	@scripts/install.sh --bindir="$(BINDIR)" \
+			    --uninstaller="$(CURDIR)/scripts/uninstall.sh" \
+			    --allow-root \
+			    --include-symlinks \
+			    --install-root="$(INSTALL_ROOT)"
+
 # Packaging targets
 .PHONY: check-arch
 check-arch:
@@ -52,9 +66,9 @@ DEB_FILENAME := $(DISTDIR)/$(NAME)_$(VERSION)-$(PACKAGE_REVISION)_$(PACKAGE_ARCH
 $(DEBDIR)/root: check-arch build
 	@echo
 	@echo "======== Formatting package contents ========"
-	@build/package/layout-unix.sh --bindir="$(BINDIR)" \
-				      --include-symlinks \
-				      --output="$(DEBDIR)/root"
+	@scripts/install.sh --bindir="$(BINDIR)" \
+			    --include-symlinks \
+			    --install-root="$(DEBDIR)/root"
 
 $(DEB_FILENAME): check-version $(DEBDIR)/root
 	@echo
@@ -83,9 +97,9 @@ PKG_FILENAME := $(DISTDIR)/$(NAME)_$(VERSION)-$(PACKAGE_REVISION)_$(PACKAGE_ARCH
 $(PKGDIR)/payload: check-arch build
 	@echo
 	@echo "======== Formatting package contents ========"
-	@build/package/layout-unix.sh --bindir="$(BINDIR)" \
-				      --uninstaller="$(CURDIR)/scripts/uninstall.sh" \
-				      --output="$(PKGDIR)/payload"
+	@scripts/install.sh --bindir="$(BINDIR)" \
+			    --uninstaller="$(CURDIR)/scripts/uninstall.sh" \
+			    --install-root="$(PKGDIR)/payload"
 
 $(PKG_FILENAME): check-version $(PKGDIR)/payload
 	@echo

build/package/layout-unix.sh renamed to scripts/install.sh

@@ -4,6 +4,19 @@ die () {
 	exit 1
 }
 
+# Setup root escalation operation
+SUDO=""
+retry_root () {
+	if [ -n "$SUDO" ]
+	then
+		# run as user, then with 'sudo'
+		$@ 2>/dev/null || "$SUDO" $@
+	else
+		# passthrough
+		$@
+	fi
+}
+
 # Parse script arguments
 for i in "$@"
 do
@@ -16,12 +29,16 @@ case "$i" in
 	UNINSTALLER="${i#*=}"
 	shift # past argument=value
 	;;
+	--allow-root)
+	SUDO=$(if command -v sudo >/dev/null 2>&1; then echo sudo; fi)
+	shift # past argument
+	;;
 	--include-symlinks)
 	INCLUDE_SYMLINKS=1
 	shift # past argument
 	;;
-	--output=*)
-	PAYLOAD="${i#*=}"
+	--install-root=*)
+	INSTALL_ROOT="${i#*=}"
 	shift # past argument=value
 	;;
 	*)
@@ -34,46 +51,43 @@ done
 if [ -z "$BINDIR" ]; then
 	die "--bindir was not set"
 fi
-if [ -z "$PAYLOAD" ]; then
-	die "--output was not set"
+if [ -z "$INSTALL_ROOT" ]; then
+	die "--install-root was not set"
+fi
+
+if [ "$INSTALL_ROOT" == "/" ]; then
+	# Reset $INSTALLDIR to empty string to avoid double leading slash
+	INSTALL_ROOT=""
 fi
 
 # Exit as soon as any line fails
 set -e
 
-# Cleanup any old payload directory
-if [ -d "$PAYLOAD" ]; then
-	echo "Cleaning old output directory '$PAYLOAD'..."
-	rm -rf "$PAYLOAD"
-fi
-
 # Ensure payload directory exists
-APP_ROOT="$PAYLOAD/usr/local/git-bundle-server"
-mkdir -p "$APP_ROOT"
+APP_ROOT="$INSTALL_ROOT/usr/local/git-bundle-server"
+retry_root mkdir -p "$APP_ROOT"
 
 # Copy built binaries
 echo "Copying binaries..."
-cp -R "$BINDIR/." "$APP_ROOT/bin"
+retry_root cp -R "$BINDIR/." "$APP_ROOT/bin"
 
 # Copy uninstaller script
 if [ -n "$UNINSTALLER" ]; then
 	echo "Copying uninstall script..."
-	cp "$UNINSTALLER" "$APP_ROOT"
+	retry_root cp "$UNINSTALLER" "$APP_ROOT"
 fi
 
 # Create symlinks
 if [ -n "$INCLUDE_SYMLINKS" ]; then
-	LINK_TO="$PAYLOAD/usr/local/bin"
+	LINK_TO="$INSTALL_ROOT/usr/local/bin"
 	RELATIVE_LINK_TO_BIN="../git-bundle-server/bin"
-	mkdir -p "$LINK_TO"
+	retry_root mkdir -p "$LINK_TO"
 
 	echo "Creating binary symlinks..."
 	for program in "$APP_ROOT"/bin/*
 	do
 		p=$(basename "$program")
-		rm -f "$LINK_TO/$p"
-		ln -s "$RELATIVE_LINK_TO_BIN/$p" "$LINK_TO/$p"
+		retry_root rm -f "$LINK_TO/$p"
+		retry_root ln -s "$RELATIVE_LINK_TO_BIN/$p" "$LINK_TO/$p"
 	done
 fi
-
-echo "Layout complete."