From c43f0808583070a22e904cd650e8ed17fe781806 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 2 Feb 2014 00:20:19 -0500 Subject: Normalize to use the string "Copyright (C)" --- src/chroot-tools/chcleanup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/chroot-tools/chcleanup') diff --git a/src/chroot-tools/chcleanup b/src/chroot-tools/chcleanup index 2ff45f9..9ad121e 100755 --- a/src/chroot-tools/chcleanup +++ b/src/chroot-tools/chcleanup @@ -1,6 +1,6 @@ #!/usr/bin/env bash set -eE -# (c) Nicolás Reynolds +# Copyright (C) Nicolás Reynolds # Released under GPLv3 # # Performs chroot cleanup smartly, it only removes the unneeded packages or -- cgit v1.2.3-2-g168b From d25f30f25ce61367c81133c9cd01fe3169d8f6c0 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 21 Mar 2014 14:39:06 -0400 Subject: Do an audit of copyright and license claims --- src/chroot-tools/chcleanup | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'src/chroot-tools/chcleanup') diff --git a/src/chroot-tools/chcleanup b/src/chroot-tools/chcleanup index 9ad121e..e766117 100755 --- a/src/chroot-tools/chcleanup +++ b/src/chroot-tools/chcleanup @@ -1,13 +1,27 @@ #!/usr/bin/env bash -set -eE # Copyright (C) Nicolás Reynolds -# Released under GPLv3 # +# License: GNU GPLv3 +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 3 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + # Performs chroot cleanup smartly, it only removes the unneeded packages or # leaves you with a cleansystem # # See: HOOKPREBUILD +set -eE + DRYRUN=${DRYRUN:-false} ################################################################################ -- cgit v1.2.3-2-g168b From c48ac8c89e596e160505bd5678db2b193607493f Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 22 Mar 2014 22:00:44 -0400 Subject: Audit the authors and copyright years of files against git logs --- src/chroot-tools/chcleanup | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/chroot-tools/chcleanup') diff --git a/src/chroot-tools/chcleanup b/src/chroot-tools/chcleanup index e766117..60a4e22 100755 --- a/src/chroot-tools/chcleanup +++ b/src/chroot-tools/chcleanup @@ -1,5 +1,6 @@ #!/usr/bin/env bash -# Copyright (C) Nicolás Reynolds +# Copyright (C) 2011-2012 Nicolás Reynolds +# Copyright (C) 2012-2013 Luke Shumaker # # License: GNU GPLv3 # -- cgit v1.2.3-2-g168b From 222856031fbbf314e8e47db414225756a9c6fba2 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 23 Mar 2014 18:09:13 -0400 Subject: Most of my desired re-licensings were authorized on the dev list --- src/chroot-tools/chcleanup | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/chroot-tools/chcleanup') diff --git a/src/chroot-tools/chcleanup b/src/chroot-tools/chcleanup index 60a4e22..a72f951 100755 --- a/src/chroot-tools/chcleanup +++ b/src/chroot-tools/chcleanup @@ -2,11 +2,12 @@ # Copyright (C) 2011-2012 Nicolás Reynolds # Copyright (C) 2012-2013 Luke Shumaker # -# License: GNU GPLv3 +# License: GNU GPLv3+ # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 3 of the License. +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -- cgit v1.2.3-2-g168b From cffbaf45b0882a5c6d63d2b798e848d5b21e800b Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 25 Mar 2014 21:39:59 -0400 Subject: chcleanup: remove the no-longer-used warning() function --- src/chroot-tools/chcleanup | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/chroot-tools/chcleanup') diff --git a/src/chroot-tools/chcleanup b/src/chroot-tools/chcleanup index a72f951..9084736 100755 --- a/src/chroot-tools/chcleanup +++ b/src/chroot-tools/chcleanup @@ -50,11 +50,6 @@ msg2() { printf "${BLUE} ->${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 } -warning() { - local mesg="$(_ "$1")"; shift - printf "${YELLOW}==> $(gettext "WARNING:")${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 -} - error() { local mesg="$(_ "$1")"; shift printf "${RED}==> $(gettext "ERROR:")${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2 -- cgit v1.2.3-2-g168b From ae871fca2853bc3e5bf14587caecfa0436ba03a3 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 25 Mar 2014 21:40:39 -0400 Subject: chcleanup: used ##*/ instead of basename --- src/chroot-tools/chcleanup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/chroot-tools/chcleanup') diff --git a/src/chroot-tools/chcleanup b/src/chroot-tools/chcleanup index 9084736..6432d5b 100755 --- a/src/chroot-tools/chcleanup +++ b/src/chroot-tools/chcleanup @@ -78,7 +78,7 @@ msg "Cleaning chroot..." cp /repo/repo.db /var/lib/pacman/sync/repo.db # Setup the temporary directory -TEMPDIR="$(mktemp --tmpdir -d $(basename $0).XXXXX)" +TEMPDIR="$(mktemp --tmpdir -d ${0##*/}.XXXXXXXXXX)" trap "rm -rf '$TEMPDIR'" EXIT cp -a /var/lib/pacman/sync "${TEMPDIR}/" -- cgit v1.2.3-2-g168b From 8831cc585ae8e9071f8c022bdfaf75e42029d7e4 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 25 Mar 2014 21:44:14 -0400 Subject: Fix quoting/escaping with 'rm' in traps. --- src/chroot-tools/chcleanup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/chroot-tools/chcleanup') diff --git a/src/chroot-tools/chcleanup b/src/chroot-tools/chcleanup index 6432d5b..bfb65ce 100755 --- a/src/chroot-tools/chcleanup +++ b/src/chroot-tools/chcleanup @@ -79,7 +79,7 @@ cp /repo/repo.db /var/lib/pacman/sync/repo.db # Setup the temporary directory TEMPDIR="$(mktemp --tmpdir -d ${0##*/}.XXXXXXXXXX)" -trap "rm -rf '$TEMPDIR'" EXIT +trap "rm -rf -- $(printf '%q' "$TEMPDIR")" EXIT cp -a /var/lib/pacman/sync "${TEMPDIR}/" pkglist="${TEMPDIR}"/pkglist.txt -- cgit v1.2.3-2-g168b