[pacman-dev] [PATCH 2/2] contrib: removed pacsysclean

[Pierre Neidhardt]

pacsysclean is made obsolete by pacsize:
- it has no package selection ability;
- it is slower;
- it has no support for non-enlish locales (for which it does not work at all).

pacsysclean has an '-o' option to pass argument to pacman. This is somewhat
clumsy and can lead to unexpected behaviours. The suggested use

  $ pacsysclean -o dt

can be replaced by

  $ pacsize $(pacman -Qqdt)

which is faster, in spite of the double call to pacman.

Signed-off-by: Pierre Neidhardt <ambrevar at gmail.com>
---
 contrib/.gitignore        |  1 -
 contrib/Makefile.am       |  3 ---
 contrib/README            |  2 --
 contrib/pacsysclean.sh.in | 66 -----------------------------------------------
 4 files changed, 72 deletions(-)
 delete mode 100644 contrib/pacsysclean.sh.in

diff --git a/contrib/.gitignore b/contrib/.gitignore
index 9cecd5e..954c1e2 100644
--- a/contrib/.gitignore
+++ b/contrib/.gitignore
@@ -8,7 +8,6 @@ paclog-pkglist
 pacscripts
 pacsearch
 pacsize
-pacsysclean
 rankmirrors
 updpkgsums
 zsh_completion
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 8c5c6da..d22b621 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -13,7 +13,6 @@ BASHSCRIPTS = \
 	paclog-pkglist \
 	pacscripts \
 	pacsize \
-	pacsysclean \
 	rankmirrors \
 	updpkgsums
 
@@ -40,7 +39,6 @@ EXTRA_DIST = \
 	pacscripts.sh.in \
 	pacsearch.in \
 	pacsize.sh.in \
-	pacsysclean.sh.in \
 	rankmirrors.sh.in \
 	updpkgsums.sh.in \
 	vimprojects \
@@ -105,7 +103,6 @@ paclog-pkglist: $(srcdir)/paclog-pkglist.sh.in
 pacscripts: $(srcdir)/pacscripts.sh.in
 pacsearch: $(srcdir)/pacsearch.in
 pacsize: $(srcdir)/pacsize.sh.in
-pacsysclean: $(srcdir)/pacsysclean.sh.in
 rankmirrors: $(srcdir)/rankmirrors.sh.in
 updpkgsums: $(srcdir)/updpkgsums.sh.in
 zsh_completion: $(srcdir)/zsh_completion.in
diff --git a/contrib/README b/contrib/README
index 4f5c17f..f8bd952 100644
--- a/contrib/README
+++ b/contrib/README
@@ -35,8 +35,6 @@ pacsize - display the size of packages. Duplicates are removed if any. The local
 database is queried first; if the package is not found, the sync database is
 then used for lookup.
 
-pacsysclean - lists installed packages sorted by size.
-
 rankmirrors - ranks pacman mirrors by their connection and opening speed.
 
 updpkgsums - performs an in place update of the checksums in a PKGBUILD.
diff --git a/contrib/pacsysclean.sh.in b/contrib/pacsysclean.sh.in
deleted file mode 100644
index 8f2eea3..0000000
--- a/contrib/pacsysclean.sh.in
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-# pacsysclean - Sort installed packages by increasing installed size. Useful for system clean-up.
-
-declare -r myname='pacsysclean'
-declare -r myver='@PACKAGE_VERSION@'
-
-PACMAN_OPTS=
-
-usage() {
-	echo "${myname} (pacman) v${myver}"
-	echo
-	echo "Sort installed packages by increasing installed size. Useful for"
-	echo "system clean-up."
-	echo
-	echo "Usage: ${myname} [options]"
-	echo
-	echo "Options:"
-	echo "  -o <options>     Specify custom pacman query options (e.g., dt)"
-	echo "  -h, --help       Show this help message and exit"
-}
-
-version() {
-	printf "%s %s\n" "$myname" "$myver"
-	echo 'Copyright (C) 2011 Eric Bélanger <snowmaniscool at gmail.com>'
-}
-
-if [ -n "$1" ]; then
-	case "$1" in
-		-o) PACMAN_OPTS="${2}" ;;
-		-h|--help) usage; exit 0 ;;
-		-V|--version) version; exit 0 ;;
-		*) usage; exit 1 ;;
-	esac
-fi
-
-IFS=$'\n'
-name="^Name.*: (.*)$"
-size="^Installed Size.*: (.*) KiB$"
-
-[[ $PACMAN_OPTS && $PACMAN_OPTS != -* ]] && PACMAN_OPTS="-$PACMAN_OPTS"
-
-for line in $(LANG=C pacman -Qi $PACMAN_OPTS); do
-	if [[ $line =~ $name ]]; then
-		printf "%s\t" ${BASH_REMATCH[1]}
-	elif [[ $line =~ $size ]]; then
-		printf "%s\n" ${BASH_REMATCH[1]}
-	fi
-done | sort -g -k2 | awk '
-BEGIN {
-	split("KiB MiB GiB TiB PiB EiB ZiB YiB", suffix)
-}
-function format_size(size) {
-	count = 1
-	while (size + 0 > 1024) {
-				 size /= 1024
-				 count++
-	}
-	sizestr = sprintf("%.2f %s", size, suffix[count])
-	return sizestr
-}
-{
-	printf("%s\t%s\n", format_size($2), $1);
-}'
-
-# vim: set noet:
-- 
1.9.0