diff options
author | Hetsh | 2022-04-06 09:14:25 +0200 |
---|---|---|
committer | Hetsh | 2022-04-06 09:14:25 +0200 |
commit | e3140ced6a5bf8d675bc0778c25ac8cad00d47c2 (patch) | |
tree | f5a33577f3b1dc7fe0e74de265af327b5647e5d7 | |
parent | 59a7326a7036c7e8737284643b8c210bac76b59e (diff) | |
download | aur-e3140ced6a5bf8d675bc0778c25ac8cad00d47c2.tar.gz |
Import from @peterfab9845
-rw-r--r-- | .SRCINFO | 9 | ||||
-rw-r--r-- | .gitignore | 7 | ||||
-rw-r--r-- | PKGBUILD | 22 | ||||
-rwxr-xr-x | prepare_update.sh | 19 |
4 files changed, 27 insertions, 30 deletions
@@ -1,11 +1,12 @@ pkgbase = mcsctl-git pkgdesc = Manage multiple minecraft servers with a simple bash script and systemd unit templates. - pkgver = master - pkgrel = 16 + pkgver = 2.2.0.r19.gc862ceb + pkgrel = 1 url = https://github.com/Hetsh/mcsctl install = mcsctl-git.install arch = any license = Unlicense + makedepends = git depends = bash depends = grep depends = java-runtime>=16 @@ -16,7 +17,7 @@ pkgbase = mcsctl-git depends = sudo provides = mcsctl conflicts = mcsctl - source = https://github.com/Hetsh/mcsctl/archive/254884c4f7c19a7b8c24e78a1ae901f2419cebd1.tar.gz - sha256sums = 5832160fc0e0ddca9984a843da6b16aff63feed503713816ff26217b54bf1c4c + source = mcsctl::git+https://github.com/Hetsh/mcsctl.git + sha256sums = SKIP pkgname = mcsctl-git diff --git a/.gitignore b/.gitignore index 577de7a7059f..b023ab69d86c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ -pkg -src +/mcsctl/ +/pkg/ +/src/ *.pkg.tar.xz -*.tar.gz +*.pkg.tar.zst @@ -1,22 +1,28 @@ # Maintainer: Hetsh <aur@hetsh.de> +# Maintainer: peterfab9845 <archlinux@peterfab.com> pkgname=mcsctl-git -pkgver=master -pkgrel=16 +pkgver=2.2.0.r19.gc862ceb +pkgrel=1 pkgdesc='Manage multiple minecraft servers with a simple bash script and systemd unit templates.' arch=('any') license=('Unlicense') depends=('bash' 'grep' 'java-runtime>=16' 'openbsd-netcat' 'sed' 'jq' 'screen' 'sudo') -provides=('mcsctl') -conflicts=('mcsctl') +makedepends=('git') +provides=("${pkgname%-*}") +conflicts=("${pkgname%-*}") install="$pkgname.install" url='https://github.com/Hetsh/mcsctl' -commit=('254884c4f7c19a7b8c24e78a1ae901f2419cebd1') -source=("$url/archive/$commit.tar.gz") -sha256sums=('5832160fc0e0ddca9984a843da6b16aff63feed503713816ff26217b54bf1c4c') +source=("${pkgname%-*}::git+${url}.git") +sha256sums=('SKIP') + +pkgver() { + cd "${pkgname%-*}" + git describe --long --tags | sed 's/\([^-]*-g\)/r\1/; s/-/./g' +} package() { - work_dir="${pkgname%-git}-$commit" + work_dir="${pkgname%-*}" install -Dm 644 "$work_dir/mcs@.service" "$pkgdir/usr/lib/systemd/system/mcs@.service" install -Dm 755 "$work_dir/mcsctl.sh" "$pkgdir/usr/bin/mcsctl" install -Dm 644 "$work_dir/mcs-update@.timer" "$pkgdir/usr/lib/systemd/system/mcs-update@.timer" diff --git a/prepare_update.sh b/prepare_update.sh index e33dbfdd2cc3..554d496050fc 100755 --- a/prepare_update.sh +++ b/prepare_update.sh @@ -17,22 +17,11 @@ source "$BUILD_FILE" if [ "$1" == "--aur-only" ] then echo "Only updating \$pkgrel!" + sed -i "s|pkgrel\=.*|pkgrel\=$((pkgrel+1))|" "$BUILD_FILE" else - # Replace with latest commit to master branch - LATEST_COMMIT=$(git ls-remote "$url" master | cut -f 1) - if [ "$commit" = "$LATEST_COMMIT" ] - then - echo "Already on latest commit!" - exit 3 - fi - sed -i "s|commit\=.*|commit\=('$LATEST_COMMIT')|" "$BUILD_FILE" - - # Update package checksum - PKG_SHA=$(curl -L -s "$url/archive/$LATEST_COMMIT.tar.gz" | sha256sum | cut -d " " -f 1) - sed -i "s|sha256sums\=.*|sha256sums\=('$PKG_SHA')|" "$BUILD_FILE" + sed -i "s|pkgrel\=.*|pkgrel\=1|" "$BUILD_FILE" + # Have makepkg update the version using pkgver() + makepkg -o fi -# Increment pkgrel on every "release" -sed -i "s|pkgrel\=.*|pkgrel\=$((pkgrel+1))|" "$BUILD_FILE" - makepkg --printsrcinfo > .SRCINFO |