summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authormaya <maya@pkgsrc.org>2020-10-14 09:50:49 +0000
committermaya <maya@pkgsrc.org>2020-10-14 09:50:49 +0000
commit39e6b61a7f962a7302374ef0bb9884f1a2bd6743 (patch)
tree4fadcfb6acb941aea628d9f60bdb2c6d991af87f /sysutils
parentdaedd2e6b4611a8d9ae70a59ac2c709dbb189dac (diff)
downloadpkgsrc-39e6b61a7f962a7302374ef0bb9884f1a2bd6743.tar.gz
sysupgrade: rm *${arch_ext} as well as *gz, not in place of.
PKGREVISION++
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/sysupgrade/Makefile4
-rw-r--r--sysutils/sysupgrade/distinfo4
-rw-r--r--sysutils/sysupgrade/patches/patch-sysupgrade.sh6
3 files changed, 7 insertions, 7 deletions
diff --git a/sysutils/sysupgrade/Makefile b/sysutils/sysupgrade/Makefile
index 89a6cd631d0..3bb5a4e6211 100644
--- a/sysutils/sysupgrade/Makefile
+++ b/sysutils/sysupgrade/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2020/10/13 00:50:08 maya Exp $
+# $NetBSD: Makefile,v 1.16 2020/10/14 09:50:49 maya Exp $
DISTNAME= sysupgrade-1.5
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GITHUB:=jmmv/}
MAINTAINER= jmmv@NetBSD.org
diff --git a/sysutils/sysupgrade/distinfo b/sysutils/sysupgrade/distinfo
index ea0f0437f33..17ba9d62b25 100644
--- a/sysutils/sysupgrade/distinfo
+++ b/sysutils/sysupgrade/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2020/10/13 00:50:08 maya Exp $
+$NetBSD: distinfo,v 1.7 2020/10/14 09:50:49 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) = cf37304667dcadf043b707f9a4436a963f4bdfff
+SHA1 (patch-sysupgrade.sh) = 532b576d5dac494ed441069e579816ae4bed3377
diff --git a/sysutils/sysupgrade/patches/patch-sysupgrade.sh b/sysutils/sysupgrade/patches/patch-sysupgrade.sh
index 0c939c148b2..fb8a6d62a50 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.4 2020/10/13 00:50:08 maya Exp $
+$NetBSD: patch-sysupgrade.sh,v 1.5 2020/10/14 09:50:49 maya Exp $
* Don't reject https in sysupgrade_fetch()
* Add ARCHIVE_EXTENSION variable (Fix PR pkg/53697)
@@ -133,7 +133,7 @@ $NetBSD: patch-sysupgrade.sh,v 1.4 2020/10/13 00:50:08 maya Exp $
done
shtk_cli_info "Performing postinstall checks"
-@@ -409,10 +426,12 @@ sysupgrade_postinstall() {
+@@ -409,10 +426,13 @@ sysupgrade_postinstall() {
# Cleans up the cache directory.
sysupgrade_clean() {
@@ -142,7 +142,7 @@ $NetBSD: patch-sysupgrade.sh,v 1.4 2020/10/13 00:50:08 maya Exp $
[ ${#} -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)"/*.*gz*
+ rm -f "$(shtk_config_get CACHEDIR)"/*.${arch_ext}*
}