feat: using proper build number for aur

This commit is contained in:
Felipe M 2021-11-03 19:05:04 +01:00
parent 38c2e48bbc
commit c7e242d67a
Signed by: fmartingr
GPG Key ID: 716BC147715E716F
3 changed files with 8 additions and 14 deletions

View File

@ -16,7 +16,7 @@ PACKAGE_FILE = f"/tmp/{PACKAGE_NAME}/package.toml"
package = toml.load(PACKAGE_FILE)
print(
huepy.run(
f'Building {PACKAGE_NAME} v{package["version"]}-{package["build_number"]}'
f'Building {PACKAGE_NAME} v{package["version"]}_{package["build_number"]}-{package["aur_build"]}'
)
)
@ -90,7 +90,7 @@ else:
pkgbuild_template = env.get_template("PKGBUILD")
pkgbuild = pkgbuild_template.render(**package)
build_path = BUILDS_PATH / Path("{version}-{build_number}".format(**package))
build_path = BUILDS_PATH / Path("{version}_{build_number}-{aur_build}".format(**package))
os.makedirs(build_path, exist_ok=True)
print(huepy.info(f"Writing PKGBUILD file..."))

View File

@ -1,8 +1,8 @@
# Maintainer: Felipe Martin <me@fmartingr.com>
pkgname="{{ name }}"
pkgver="{{ version }}"
pkgrel="{{ build_number }}"
pkgver="{{ version }}_{{ build_number }}"
pkgrel="{{ aur_build }}"
pkgdesc="{{ description }}"
arch=('{{ arch|join("' '") }}')
url="{{ url }}"

View File

@ -1,16 +1,10 @@
{% extends "PKGBUILD.base.j2" %}
{% block operations %}
prepare() {
cd "$srcdir"
mkdir -p data
ar x {{ name }}-*
xz -d data.tar.xz
tar xf data.tar --directory data
}
package() {
cp -r "$srcdir/data/opt" "$pkgdir/opt"
cp -r "$srcdir/data/usr" "$pkgdir/usr"
cd "${srcdir}"
tar -xJf data.tar.xz -C "${pkgdir}"
ls "${pkgdir}"
install -Dm 644 "${pkgdir}"/opt/Synology/SynologyDrive/LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
{% endblock %}