diff options
| author | maya <maya@pkgsrc.org> | 2020-10-13 00:50:08 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2020-10-13 00:50:08 +0000 |
| commit | bdd94a55c45fc271e9a803f857461d51b7cbe76a (patch) | |
| tree | 24a823d978f8a9f228f71100904b6b683bba7d08 /sysutils | |
| parent | 6372d5fee922f05d4e5980fc72ccc05b7b13acc1 (diff) | |
| download | pkgsrc-bdd94a55c45fc271e9a803f857461d51b7cbe76a.tar.gz | |
sysupgrade: PKGREVISION->5, handle ARCHIVE_EXTENSION also in sysupgrade clean
From Sunil Nimmagadda in PR pkg/55713
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/sysupgrade/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/sysupgrade/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/sysupgrade/patches/patch-sysupgrade.sh | 16 |
3 files changed, 19 insertions, 5 deletions
diff --git a/sysutils/sysupgrade/Makefile b/sysutils/sysupgrade/Makefile index 9a7ed28a6c6..89a6cd631d0 100644 --- a/sysutils/sysupgrade/Makefile +++ b/sysutils/sysupgrade/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.14 2019/06/03 20:35:55 triaxx Exp $ +# $NetBSD: Makefile,v 1.15 2020/10/13 00:50:08 maya Exp $ DISTNAME= sysupgrade-1.5 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_GITHUB:=jmmv/} MAINTAINER= jmmv@NetBSD.org diff --git a/sysutils/sysupgrade/distinfo b/sysutils/sysupgrade/distinfo index d7139ea641c..ea0f0437f33 100644 --- a/sysutils/sysupgrade/distinfo +++ b/sysutils/sysupgrade/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2019/06/06 16:30:13 triaxx Exp $ +$NetBSD: distinfo,v 1.6 2020/10/13 00:50:08 maya Exp $ SHA1 (sysupgrade-1.5.tar.gz) = 3141ee4728d6d3b680ed04f552369031bb3b3b09 RMD160 (sysupgrade-1.5.tar.gz) = 5b1d7c6d45643f2f03bff1df16739a6751d0ceda @@ -6,4 +6,4 @@ SHA512 (sysupgrade-1.5.tar.gz) = 47f37ce6802b8ba74d6edd19a2c80d46394c992b58d3077 Size (sysupgrade-1.5.tar.gz) = 75833 bytes SHA1 (patch-default.conf) = ff367ebbdc56e1009a57a8bd254c424033257726 SHA1 (patch-sysupgrade.conf.5.in) = dfe5d90d0360212ea052f2e25a26820ad277480b -SHA1 (patch-sysupgrade.sh) = e84a8ea01fca16734206a864b0a51f38c27489a8 +SHA1 (patch-sysupgrade.sh) = cf37304667dcadf043b707f9a4436a963f4bdfff diff --git a/sysutils/sysupgrade/patches/patch-sysupgrade.sh b/sysutils/sysupgrade/patches/patch-sysupgrade.sh index bfdd62ffc80..0c939c148b2 100644 --- a/sysutils/sysupgrade/patches/patch-sysupgrade.sh +++ b/sysutils/sysupgrade/patches/patch-sysupgrade.sh @@ -1,4 +1,4 @@ -$NetBSD: patch-sysupgrade.sh,v 1.3 2019/06/06 16:30:13 triaxx Exp $ +$NetBSD: patch-sysupgrade.sh,v 1.4 2020/10/13 00:50:08 maya Exp $ * Don't reject https in sysupgrade_fetch() * Add ARCHIVE_EXTENSION variable (Fix PR pkg/53697) @@ -133,3 +133,17 @@ $NetBSD: patch-sysupgrade.sh,v 1.3 2019/06/06 16:30:13 triaxx Exp $ done shtk_cli_info "Performing postinstall checks" +@@ -409,10 +426,12 @@ sysupgrade_postinstall() { + + # Cleans up the cache directory. + sysupgrade_clean() { ++ local arch_ext="$(shtk_config_get ARCHIVE_EXTENSION)" ++ + [ ${#} -eq 0 ] || shtk_cli_usage_error "clean does not take any arguments" + + shtk_cli_info "Cleaning downloaded files" +- rm -f "$(shtk_config_get CACHEDIR)"/*.*gz* ++ rm -f "$(shtk_config_get CACHEDIR)"/*.${arch_ext}* + } + + |