implement a more efficient dist

Author: gesquive

Makefile

@@ -7,7 +7,7 @@
 GOCC := go
 
 # Program version
-VERSION := $(shell git describe --always --tags)
+VERSION ?= $(shell git describe --always --tags)
 
 # Binary name for bintray
 BIN_NAME=git-user
@@ -36,6 +36,8 @@ INSTALL_PATH=$(GOPATH)/${REPO_HOST_URL}/${OWNER}/${PROJECT_NAME}
 
 FIND_DIST:=find * -type d -exec
 
+BUILD_DIR=dist
+
 default: build
 
 help:
@@ -88,12 +90,12 @@ build-all: bootstrap-dist
 -output="dist/{{.OS}}-{{.Arch}}/{{.Dir}}" .
 
 dist: build-all
-cd dist && \
-$(FIND_DIST) cp ../LICENSE {} \; && \
-$(FIND_DIST) cp ../README.md {} \; && \
-$(FIND_DIST) tar -zcf ${PROJECT_NAME}-${VERSION}-{}.tar.gz {} \; && \
-$(FIND_DIST) zip -r ${PROJECT_NAME}-${VERSION}-{}.zip {} \; && \
-cd ..
+install/dist.sh "linux-386" "${PROJECT_NAME}-${VERSION}-linux-x32"
+install/dist.sh "linux-amd64" "${PROJECT_NAME}-${VERSION}-linux-x64"
+install/dist.sh "darwin-386" "${PROJECT_NAME}-${VERSION}-osx-x32"
+install/dist.sh "darwin-amd64" "${PROJECT_NAME}-${VERSION}-osx-x64"
+install/dist.sh "windows-386" "${PROJECT_NAME}-${VERSION}-windows-x32"
+install/dist.sh "windows-amd64" "${PROJECT_NAME}-${VERSION}-windows-x64"
 
 docs:
 cd genman && ${GOCC} build -ldflags "-X main.version=${VERSION}"

install/dist.sh

@@ -0,0 +1,54 @@
+#!/bin/bash
+
+pushd () {
+ command pushd "$@" > /dev/null
+}
+
+popd () {
+ command popd > /dev/null
+}
+
+
+if [ "$#" -ne 2 ]; then
+ echo "Usage: $0 SRCDIRNAME DISTNAME" >&2
+ exit 1
+fi
+
+SRCNAME="$1"
+DSTNAME="$2"
+
+SRC="dist/${SRCNAME}"
+DST="dist/${DSTNAME}"
+
+if [ ! -d "${SRC}" ]; then
+ echo "Source directory \"${SRC}\" does not exist"
+ exit 1
+fi
+
+# Remove target if it exists
+rm -rf "${DST}"
+# Setup target
+cp -r "${SRC}" "${DST}"
+
+# echo "Packaging distribution"
+# Copy dist files
+cp LICENSE "${DST}"
+cp README.md "${DST}"
+
+if [[ "${DST}" != *"windows"* ]]; then
+ cp -r man "${DST}"
+ cp install/install-nix.sh "${DST}/install.sh"
+ # echo "Compressing tarbell"
+ pushd dist || exit
+ rm -f "${DSTNAME}.tar.gz"
+tar -zcf "${DSTNAME}.tar.gz" "${DSTNAME}"
+ popd
+else
+ # echo "Compressing zip file"
+ pushd dist || exit
+ rm -f "${DSTNAME}.zip"
+ zip -qr "${DSTNAME}.zip" "${DSTNAME}"
+ popd
+fi
+
+rm -rf ${DST}

install/install-nix.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# Check we have permissions
+# if [[ $EUID -ne 0 ]]; then
+# echo "This script must be run as root" 1>&2
+# exit 1
+# fi
+
+if [ "$1" == "-u" ]||[ "$1" == "--uninstall" ]; then
+ echo "Uninstalling application"
+ rm -f "/usr/local/bin/git-user"
+ rm -f "/usr/local/share/man/man1/git-user*"
+ exit 0;
+fi
+
+# Remove the app if it already exists
+APP="/usr/local/bin/git-user"
+if [ -d "$APP" ]; then
+ echo "Removing existing application"
+ rm -rf "${APP}"
+fi
+
+# Copy our executable to /usr/local/bin
+echo "Installing git-user"
+cp -f git-user /usr/local/bin
+
+# Copy our man files
+mkdir -p /usr/local/share/man/man1
+cp man/*.1 /usr/local/share/man/man1