From owner-svn-ports-head@freebsd.org Sat May 19 16:21:15 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 858AEED636E; Sat, 19 May 2018 16:21:15 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3B5ED75028; Sat, 19 May 2018 16:21:15 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1DBD81654; Sat, 19 May 2018 16:21:15 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4JGLE4L097034; Sat, 19 May 2018 16:21:14 GMT (envelope-from miwi@FreeBSD.org) Received: (from miwi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4JGLEtK097031; Sat, 19 May 2018 16:21:14 GMT (envelope-from miwi@FreeBSD.org) Message-Id: <201805191621.w4JGLEtK097031@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: miwi set sender to miwi@FreeBSD.org using -f From: Martin Wilke Date: Sat, 19 May 2018 16:21:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r470416 - in head/ports-mgmt/pkg-rmleaf: . files X-SVN-Group: ports-head X-SVN-Commit-Author: miwi X-SVN-Commit-Paths: in head/ports-mgmt/pkg-rmleaf: . files X-SVN-Commit-Revision: 470416 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 May 2018 16:21:15 -0000 Author: miwi Date: Sat May 19 16:21:14 2018 New Revision: 470416 URL: https://svnweb.freebsd.org/changeset/ports/470416 Log: - Update to 0.4 PR: 227828 Submitted by: maintainer Sponsored by: iXsystems Inc. Modified: head/ports-mgmt/pkg-rmleaf/Makefile head/ports-mgmt/pkg-rmleaf/files/pkg-rmleaf head/ports-mgmt/pkg-rmleaf/pkg-descr Modified: head/ports-mgmt/pkg-rmleaf/Makefile ============================================================================== --- head/ports-mgmt/pkg-rmleaf/Makefile Sat May 19 15:53:04 2018 (r470415) +++ head/ports-mgmt/pkg-rmleaf/Makefile Sat May 19 16:21:14 2018 (r470416) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pkg-rmleaf -PORTVERSION= 0.3 +PORTVERSION= 0.4 CATEGORIES= ports-mgmt MASTER_SITES= # none DISTFILES= # none Modified: head/ports-mgmt/pkg-rmleaf/files/pkg-rmleaf ============================================================================== --- head/ports-mgmt/pkg-rmleaf/files/pkg-rmleaf Sat May 19 15:53:04 2018 (r470415) +++ head/ports-mgmt/pkg-rmleaf/files/pkg-rmleaf Sat May 19 16:21:14 2018 (r470416) @@ -1,8 +1,8 @@ #!/bin/sh -# version 0.3 +# Version: 0.4 -# Copyright (c) 2014 Yanhui Shen, shen.elf@gmail.c0m +# Copyright (c) 2013-2018 Yanhui Shen # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -29,12 +29,11 @@ cols=$((`stty size | cut -w -f2` - 6)) rows=$((`stty size | cut -w -f1` - 4)) height=$(($rows - 7)) -sep="#" -PkgQuery="pkg query -e \"%#r=0\" \"%o$sep%c\" | sort" +PkgQuery="pkg query -e \"%#r=0\" \"%o %n-%v %c\" | sort -k 1" PkgDelete="pkg delete -y" FmtDialog="dialog --checklist \"Leaf Packages: %s\" $rows $cols $height %s" -KeptLeaves="" +KnownLeaves="" while true; do #==== refresh leaves ==== echo "Querying..." @@ -48,43 +47,41 @@ while true; do IFS=" " for line in $AllLeaves; do - case $line in - (*"$sep"*) - port=${line%%"$sep"*} - desc=${line#*"$sep"} - ;; - (*) - echo "Bad line: " $line - exit - ;; - esac + origin=`echo "$line" | cut -d' ' -f 1` + category=`echo "$origin" | cut -d'/' -f 1` + name=`echo "$line" | cut -d' ' -f 2` + desc=`echo "$line" | cut -d' ' -f 3-` + port="$category:$name" - ret=`echo "$KeptLeaves" | grep "$port"` + ret=`echo "$KnownLeaves" | grep "$name"` if [ -z "$ret" ]; then - NewLeaves="$NewLeaves $port \"$desc\" off" + NewLeaves="$NewLeaves \"$port\" \"$desc\" off" nNewLeaves=$(($nNewLeaves + 1)) fi done #==== show dialog ==== if [ -z "$NewLeaves" ]; then - echo "Nothing to do!" + echo "No more new leaves." exit fi cmd=`printf $FmtDialog "$nNewLeaves" "$NewLeaves"` - selections=`eval "$cmd 3>&2 2>&1 1>&3"` + selected=`eval "$cmd 3>&2 2>&1 1>&3"` if [ $? -ne 0 ]; then echo "Canceled." exit fi - #==== record old leaves ==== - KeptLeaves="$AllLeaves" + #==== save current leaves ==== + KnownLeaves="$AllLeaves" - #==== deinstall selected ==== - if [ -z $selections ]; then - echo "No selection, quit." + #==== extract names ==== + names=`echo $selected | sed 's/[[:alnum:]_-]\{1,\}://g'` + if [ -z $names ]; then + echo "No packages." exit fi - eval "$PkgDelete $selections" + + #==== uninstall selected ==== + eval "$PkgDelete $names" done Modified: head/ports-mgmt/pkg-rmleaf/pkg-descr ============================================================================== --- head/ports-mgmt/pkg-rmleaf/pkg-descr Sat May 19 15:53:04 2018 (r470415) +++ head/ports-mgmt/pkg-rmleaf/pkg-descr Sat May 19 16:21:14 2018 (r470416) @@ -1 +1,3 @@ -A little script for removing leaf packages (requires pkgng). +A little script for removing leaf packages (requires pkg). + +WWW: https://github.com/bsdelf/pkg-rmleaf