feat: using proper build number for aur
This commit is contained in:
parent
38c2e48bbc
commit
c7e242d67a
4
build.py
4
build.py
|
@ -16,7 +16,7 @@ PACKAGE_FILE = f"/tmp/{PACKAGE_NAME}/package.toml"
|
||||||
package = toml.load(PACKAGE_FILE)
|
package = toml.load(PACKAGE_FILE)
|
||||||
print(
|
print(
|
||||||
huepy.run(
|
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_template = env.get_template("PKGBUILD")
|
||||||
pkgbuild = pkgbuild_template.render(**package)
|
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)
|
os.makedirs(build_path, exist_ok=True)
|
||||||
|
|
||||||
print(huepy.info(f"Writing PKGBUILD file..."))
|
print(huepy.info(f"Writing PKGBUILD file..."))
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
# Maintainer: Felipe Martin <me@fmartingr.com>
|
# Maintainer: Felipe Martin <me@fmartingr.com>
|
||||||
|
|
||||||
pkgname="{{ name }}"
|
pkgname="{{ name }}"
|
||||||
pkgver="{{ version }}"
|
pkgver="{{ version }}_{{ build_number }}"
|
||||||
pkgrel="{{ build_number }}"
|
pkgrel="{{ aur_build }}"
|
||||||
pkgdesc="{{ description }}"
|
pkgdesc="{{ description }}"
|
||||||
arch=('{{ arch|join("' '") }}')
|
arch=('{{ arch|join("' '") }}')
|
||||||
url="{{ url }}"
|
url="{{ url }}"
|
||||||
|
|
|
@ -1,16 +1,10 @@
|
||||||
{% extends "PKGBUILD.base.j2" %}
|
{% extends "PKGBUILD.base.j2" %}
|
||||||
|
|
||||||
{% block operations %}
|
{% block operations %}
|
||||||
prepare() {
|
|
||||||
cd "$srcdir"
|
|
||||||
mkdir -p data
|
|
||||||
ar x {{ name }}-*
|
|
||||||
xz -d data.tar.xz
|
|
||||||
tar xf data.tar --directory data
|
|
||||||
}
|
|
||||||
|
|
||||||
package() {
|
package() {
|
||||||
cp -r "$srcdir/data/opt" "$pkgdir/opt"
|
cd "${srcdir}"
|
||||||
cp -r "$srcdir/data/usr" "$pkgdir/usr"
|
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 %}
|
{% endblock %}
|
||||||
|
|
Loading…
Reference in New Issue