summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-11-12 20:37:57 -0500
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-11-12 20:37:57 -0500
commitb613269b38cf0017b92955bb79bfb2dee5be2780 (patch)
tree9b2d8865fe72162376c4a0b861b8a28b4e0d269f
parent900764cb388a8709dff1f9c1d73c3fc96fcb43ec (diff)
require manually bumping pkgver
-rwxr-xr-xbuild2
-rw-r--r--common.sh17
2 files changed, 1 insertions, 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