From b613269b38cf0017b92955bb79bfb2dee5be2780 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 12 Nov 2016 20:37:57 -0500 Subject: require manually bumping pkgver --- build | 2 +- common.sh | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/build b/build index 0c70c8e..bee133b 100755 --- a/build +++ b/build @@ -12,7 +12,7 @@ main() { for src in *.PKGBUILD; do pkg="$(pkgfilename "$src")" while ! { test "$src" -ot "$pkg" && test config.sh -ot "$pkg"; } 2>/dev/null; do - makepkg -d -p "$src" + makepkg -d -p "$src" || exit $? pkg="$(pkgfilename "$src")" done pkgs+=("$pkg") diff --git a/common.sh b/common.sh index 97aaf0e..97da4a3 100644 --- a/common.sh +++ b/common.sh @@ -12,23 +12,6 @@ case "$pkgname" in ;; esac -pkgver() { - local oldpkgver oldpkgver_date oldpkgver_rel - local newpkgver newpkgver_date - oldpkgver="$pkgver" - oldpkgver_date=${oldpkgver%%.*} - oldpkgver_rel=${oldpkgver#${oldpkgver_date}}; oldpkgver_rel=${oldpkgver_rel#.}; oldpkgver_rel=${oldpkgver_rel:-0} - newpkgver_date=$(date +%Y%m%d) - # Handle doing multiple versions in the same day - if [[ "$newpkgver_date" == "$oldpkgver_date" ]]; then - declare -i newpkgver_rel=${oldpkgver_rel}+1 - newpkgver=${newpkgver_date}.${newpkgver_rel} - else - newpkgver=${newpkgver_date} - fi - echo $newpkgver -} - netctl-enable() ( . "etc/netctl/$1" unit=netctl@"$(systemd-escape -- "$1")".service -- cgit v1.2.3