diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2018-08-26 13:43:56 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2018-08-26 14:08:53 -0400 |
| commit | d12001aa4e3bab0c68f1fb81705498f09bdd52ac (patch) | |
| tree | 05200e4fcb27697bc3b4879f5fa756d629e52094 | |
| parent | 906f08324f461e569c81eb2a653bd3e83fcafbfb (diff) | |
Use ART to build the packages
| -rw-r--r-- | .gitignore | 6 | ||||
| -rw-r--r-- | art.toml | 6 | ||||
| -rwxr-xr-x | build | 33 | ||||
| -rw-r--r-- | common.sh | 1 | ||||
| -rw-r--r-- | config-service-config.PKGBUILD | 3 |
5 files changed, 15 insertions, 34 deletions
@@ -1,7 +1,7 @@ *.db -*.db.tar.gz +*.db.tar.* *.files -*.files.tar.gz +*.files.tar.* *.old /pkg/ @@ -12,3 +12,5 @@ /.tmp.* /*.mw + +.art-cache diff --git a/art.toml b/art.toml new file mode 100644 index 0000000..9676222 --- /dev/null +++ b/art.toml @@ -0,0 +1,6 @@ +[[source]] +path = "." + +[target] +path = "." +name = "config" @@ -1,31 +1,2 @@ -#!/usr/bin/env bash - -pkgfilename() ( - BUILDFILE="$(realpath -ms -- "$1")" - . "$BUILDFILE" - echo $pkgname-$pkgver-$pkgrel-any.pkg.tar.xz -) - -main() { - local src pkg - local pkgs=() - for src in *.PKGBUILD; do - pkg="$(pkgfilename "$src")" - while ! { test "$src" -ot "$pkg" && test config.sh -ot "$pkg"; } 2>/dev/null; do - printf '%s: Building %q\n' "$0" "$src" - makepkg -d -p "$src" || exit $? - pkg="$(pkgfilename "$src")" - done - pkgs+=("$pkg") - done - - for pkg in "${pkgs[@]}"; do - if test "$pkg" -nt config.db.tar.gz; then - rm -f config.{db,files}{,.tar.gz} - repo-add config.db.tar.gz "${pkgs[@]}" - return - fi - done -} - -main "$@" +#!/bin/sh +art @@ -1,4 +1,5 @@ pkgrel=1 +options=('!debug') arch=(any) pkgname=$(basename "$BUILDFILE" .PKGBUILD) case "$pkgname" in diff --git a/config-service-config.PKGBUILD b/config-service-config.PKGBUILD index 79c23b4..ed59d8b 100644 --- a/config-service-config.PKGBUILD +++ b/config-service-config.PKGBUILD @@ -1,5 +1,5 @@ . ${BUILDFILE%/*}/common.sh -pkgver=20161112 +pkgver=20180826 package() { preamble @@ -8,6 +8,7 @@ preamble depends+=( config-mgmt-nginx config-mgmt-certbot + art ) add-file -m755 etc/ssl/misc/certbot-get.d/10-config <<EOF |