From 767508c4f09863f9b23735ac7072d651a87ba972 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 9 Jun 2020 17:01:01 +0200 Subject: [PATCH] scripts/build_deb.sh: refactor common code to build.sh --- Makefile | 2 +- scripts/build.sh | 37 +++++++++++++++++++++++++++++++++++++ scripts/build_deb.sh | 13 +------------ 3 files changed, 39 insertions(+), 13 deletions(-) create mode 100755 scripts/build.sh diff --git a/Makefile b/Makefile index 5eea3a0..7d9188c 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ package_deb: build export PACKAGE_VERSION="0.3.1" \ export PACKAGE_PREFIX=$(PREFIX:/%=%) \ export PACKAGE_PROGRAM="build/$(PROGRAM_NAME)" \ - && ./scripts/build_deb.sh + && ./scripts/build.sh deb clean: $(GO) clean diff --git a/scripts/build.sh b/scripts/build.sh new file mode 100755 index 0000000..c4c082a --- /dev/null +++ b/scripts/build.sh @@ -0,0 +1,37 @@ +#!/bin/bash + +############################ +# Exported variables. # +############################ + +export BASE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" + +# Info +export PACKAGE_DESCRIPTION="HAproxy healthcheck program for EOSIO API." + +# Directories. +export PACKAGE_BINDIR=${PACKAGE_PREFIX}/bin +export PACKAGE_ETCDIR=etc/${PACKAGE_NAME} +export PACKAGE_SYSUNITDIR=etc/systemd/system +export PACKAGE_RSYSLOGDIR=etc/rsyslog.d +export PACKAGE_LOGROTATEDIR=etc/logrotate.d +export PACKAGE_LOGDIR=/var/log +export PACKAGE_LOGFILE=${PACKAGE_LOGDIR}/${PACKAGE_NAME}.log +export PACKAGE_SHAREDIR=${PACKAGE_PREFIX}/share/${PACKAGE_NAME} +export PACKAGE_TMPDIR="pack" + +if [ $# -lt 1 ]; then + echo "$0 " + exit 1 +fi + +PKG_TYPE=$1 +PKG_SCRIPT="${BASE_DIR}/build_${PKG_TYPE}.sh" + +# Check and call script +if [ ! -x $PKG_SCRIPT ]; then + echo "$PKG_SCRIPT not found" + exit 1 +fi + +$PKG_SCRIPT diff --git a/scripts/build_deb.sh b/scripts/build_deb.sh index b75de52..28011d8 100755 --- a/scripts/build_deb.sh +++ b/scripts/build_deb.sh @@ -1,17 +1,6 @@ #!/usr/bin/env bash -BASE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" - -PACKAGE_BINDIR=${PACKAGE_PREFIX}/bin -PACKAGE_ETCDIR=etc/${PACKAGE_NAME} -PACKAGE_SYSUNITDIR=etc/systemd/system -PACKAGE_RSYSLOGDIR=etc/rsyslog.d -PACKAGE_LOGROTATEDIR=etc/logrotate.d -PACKAGE_LOGDIR=/var/log -PACKAGE_LOGFILE=${PACKAGE_LOGDIR}/${PACKAGE_NAME}.log -PACKAGE_SHAREDIR=${PACKAGE_PREFIX}/share/${PACKAGE_NAME} -PACKAGE_DESCRIPTION="HAproxy healthcheck program for EOSIO API." -PACKAGE_TMPDIR="pack" +PACKAGE_TMPDIR="${PACKAGE_TMPDIR}/debian" if [[ -f /etc/upstream-release/lsb-release ]]; then source /etc/upstream-release/lsb-release