From 998913c5a2ddb4794cdb9ebe36b8f4164c41b978 Mon Sep 17 00:00:00 2001 From: MatMoul Date: Sat, 14 Jan 2023 12:57:59 +0100 Subject: [PATCH] dev --- bin/pkgbuilder | 2 +- models/custom/plugin | 31 ++++++++++++++-------------- models/github-release/files/PKGBUILD | 3 ++- plugins/manual | 3 ++- 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/bin/pkgbuilder b/bin/pkgbuilder index e90a3ce..e146949 100755 --- a/bin/pkgbuilder +++ b/bin/pkgbuilder @@ -68,7 +68,7 @@ updatePkgSums() { # $1=FILES local -r FILES=${1} local TMPDIR="" TMPDIR=$(mktemp -d) - cp -r "${FILES}/*" "${TMPDIR}" + cp -r "${FILES}"/* "${TMPDIR}" chown -R pkgbuilder "${TMPDIR}" sudo -u pkgbuilder updpkgsums "${TMPDIR}"/PKGBUILD cp -r "${TMPDIR}"/PKGBUILD "${FILES}/" diff --git a/models/custom/plugin b/models/custom/plugin index 91b7ccd..4a616f9 100644 --- a/models/custom/plugin +++ b/models/custom/plugin @@ -1,25 +1,26 @@ #!/bin/bash -custom_plugin_isupdatable() { +plugin_isupdatable() { return 1 } -custom_plugin_isbumpable() { +plugin_isbumpable() { + return 0 +} + +plugin_getpkgfiles() { + echo "${PKGDIR}/${PKGNAME}/files" +} + +plugin_bump() { + local -r PKGREL=$(readSetting "${PKGBUILD}" "pkgrel" 0) + sed -i "s/pkgrel=.*/pkgrel=$((PKGREL+1))/" "${PKGBUILD}" +} + +plugin_getlatestversion() { return 1 } -custom_plugin_getpkgfiles() { +plugin_update() { return 1 } - -custom_plugin_bump() { - return 1 -} - -custom_plugin_getlatestversion() { - return 1 -} - -custom_plugin_update() { - return 1 -} \ No newline at end of file diff --git a/models/github-release/files/PKGBUILD b/models/github-release/files/PKGBUILD index 87e6764..5b87d34 100644 --- a/models/github-release/files/PKGBUILD +++ b/models/github-release/files/PKGBUILD @@ -17,7 +17,8 @@ url="https://github.com/${_githubuser}/${_githubrepo}" #install="${pkgname}.install" #provides=() #backup=() -source=("${_githubrepo}::https://github.com/${_githubuser}/${_githubrepo}/archive/refs/tags/${_pkgtagname}.tar.gz") +#source=("${_githubrepo}::https://github.com/${_githubuser}/${_githubrepo}/archive/refs/tags/${_pkgtagname}.tar.gz") +#source=("${_githubrepo}::https://github.com/${_githubuser}/${_githubrepo}/releases/download/v${pkgver}/${_githubrepo}-${pkgver}.tar.gz") sha256sums=('SKIP') build() { diff --git a/plugins/manual b/plugins/manual index ae2b28a..3081a29 100644 --- a/plugins/manual +++ b/plugins/manual @@ -9,7 +9,8 @@ plugin_isbumpable() { } plugin_getpkgfiles() { - updatePkgSums "${PKGDIR}"/"${PKGNAME}"/files + updatePkgSums "${PKGDIR}/${PKGNAME}/files" + echo "${PKGDIR}/${PKGNAME}/files" } plugin_bump() {