CVS commit: pkgsrc/sysutils/sysupgrade

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Tue Oct 13 00:50:08 UTC 2020

Modified Files:
        pkgsrc/sysutils/sysupgrade: Makefile distinfo
        pkgsrc/sysutils/sysupgrade/patches: patch-sysupgrade.sh

Log Message:
sysupgrade: PKGREVISION->5, handle ARCHIVE_EXTENSION also in sysupgrade clean

>From Sunil Nimmagadda in PR pkg/55713


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/sysutils/sysupgrade/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/sysupgrade/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/sysutils/sysupgrade/patches/patch-sysupgrade.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/sysupgrade/Makefile
diff -u pkgsrc/sysutils/sysupgrade/Makefile:1.14 pkgsrc/sysutils/sysupgrade/Makefile:1.15
--- pkgsrc/sysutils/sysupgrade/Makefile:1.14    Mon Jun  3 20:35:55 2019
+++ pkgsrc/sysutils/sysupgrade/Makefile Tue Oct 13 00:50:08 2020
@@ -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@localhost

Index: pkgsrc/sysutils/sysupgrade/distinfo
diff -u pkgsrc/sysutils/sysupgrade/distinfo:1.5 pkgsrc/sysutils/sysupgrade/distinfo:1.6
--- pkgsrc/sysutils/sysupgrade/distinfo:1.5     Thu Jun  6 16:30:13 2019
+++ pkgsrc/sysutils/sysupgrade/distinfo Tue Oct 13 00:50:08 2020
@@ -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) = 47f37ce
 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

Index: pkgsrc/sysutils/sysupgrade/patches/patch-sysupgrade.sh
diff -u pkgsrc/sysutils/sysupgrade/patches/patch-sysupgrade.sh:1.3 pkgsrc/sysutils/sysupgrade/patches/patch-sysupgrade.sh:1.4
--- pkgsrc/sysutils/sysupgrade/patches/patch-sysupgrade.sh:1.3  Thu Jun  6 16:30:13 2019
+++ pkgsrc/sysutils/sysupgrade/patches/patch-sysupgrade.sh      Tue Oct 13 00:50:08 2020
@@ -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/
      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}*
+ }
+ 
+