From 048ae6172b791ab9f5ae7cce022ba9f6d39dac18 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 3 Jan 2014 22:22:01 -0500 Subject: touch up misc qouting --- src/fullpkg/fullpkg-find | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/fullpkg/fullpkg-find') diff --git a/src/fullpkg/fullpkg-find b/src/fullpkg/fullpkg-find index a96bc8a..2a5fc44 100755 --- a/src/fullpkg/fullpkg-find +++ b/src/fullpkg/fullpkg-find @@ -51,7 +51,7 @@ # Get repo name. Asumes ${ABSROOT}/repo/package/PKGBUILD guess_repo() { - basename $(dirname $(pwd)) + basename "$(dirname "$(pwd)")" } # This function is stolen from makechrootpkg. @@ -139,7 +139,7 @@ find_deps() { pushd "${pkgdir}" > /dev/null # runs itself on dep's PKGBUILD dir - $0 -l ${next_level} ${build_dir} || return $? + "$0" -l "${next_level}" "${build_dir}" || return $? popd > /dev/null fi -- cgit v1.2.3-2-g168b From fcddad60721db6dceb4858fc752f109c954e54e2 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 3 Jan 2014 22:25:33 -0500 Subject: fullpkg-find: touch up dependency listing --- src/fullpkg/fullpkg-find | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/fullpkg/fullpkg-find') diff --git a/src/fullpkg/fullpkg-find b/src/fullpkg/fullpkg-find index 2a5fc44..f1b9573 100755 --- a/src/fullpkg/fullpkg-find +++ b/src/fullpkg/fullpkg-find @@ -120,11 +120,12 @@ find_deps() { ## Check next levels declare -i next_level=$LEVEL+1 - # All deps in separate line, only once, without version. - deps=($(echo "${depends[@]} ${makedepends[@]}" | \ - sed "s/[=<>]\+[^ ]\+//g" | \ - tr ' ' "\n" | \ - sort -u)) + # All deps + local deps=("${depends[@]}" "${makedepends[@]}" "${checkdepends[@]}") + # Strip version specifiers + deps=("${deps[@]%%[=<>]*}") + # Filter out duplicates + read -d $'\n' -a deps <<<"$(printf '%s\n' "${deps[@]}"|sort -u)" local _dep for _dep in "${deps[@]}"; do -- cgit v1.2.3-2-g168b From ea11eca851e1b54e36d310f4d69e099f169191e8 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 2 Feb 2014 00:05:22 -0500 Subject: I forgot to bump the copyright year on all the files I've touched this year --- src/fullpkg/fullpkg-find | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/fullpkg/fullpkg-find') diff --git a/src/fullpkg/fullpkg-find b/src/fullpkg/fullpkg-find index f1b9573..a47717b 100755 --- a/src/fullpkg/fullpkg-find +++ b/src/fullpkg/fullpkg-find @@ -4,7 +4,7 @@ # Copyright (c) 2011-2012 Joshua I. Haase H. (xihh) # Copyright (c) 2011-2012 Nicolás Reynolds # Copyright (c) 2012 Michał Masłowski -# Copyright (c) 2012-2013 Luke Shumaker +# Copyright (c) 2012-2014 Luke Shumaker # # The copy_files() function is taken from makechrootpkg: # Copyright (c) 2007 Armin Luntzer -- cgit v1.2.3-2-g168b 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/fullpkg/fullpkg-find | 52 ++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'src/fullpkg/fullpkg-find') diff --git a/src/fullpkg/fullpkg-find b/src/fullpkg/fullpkg-find index a47717b..8bd630c 100755 --- a/src/fullpkg/fullpkg-find +++ b/src/fullpkg/fullpkg-find @@ -1,34 +1,34 @@ #!/usr/bin/env bash # set -x # uncomment for debug -# Copyright (c) 2011-2012 Joshua I. Haase H. (xihh) -# Copyright (c) 2011-2012 Nicolás Reynolds -# Copyright (c) 2012 Michał Masłowski -# Copyright (c) 2012-2014 Luke Shumaker +# Copyright (C) 2011-2012 Joshua I. Haase H. (xihh) +# Copyright (C) 2011-2012 Nicolás Reynolds +# Copyright (C) 2012 Michał Masłowski +# Copyright (C) 2012-2014 Luke Shumaker # # The copy_files() function is taken from makechrootpkg: -# Copyright (c) 2007 Armin Luntzer -# Copyright (c) 2007 Jason Chu -# Copyright (c) 2007, 2011 Dan McGee -# Copyright (c) 2007-2008 Travis Willard -# Copyright (c) 2007-2009 Aaron Griffin -# Copyright (c) 2008 Simo Leone -# Copyright (c) 2009 Biru Ionut -# Copyright (c) 2009 Biru Ionut -# Copyright (c) 2009 Evangelos Foutras -# Copyright (c) 2009 Francois Charette -# Copyright (c) 2009 Nezmer -# Copyright (c) 2009 Ronald van Haren -# Copyright (c) 2009-2011 Andrea Scarpino -# Copyright (c) 2009-2012 Allan McRae -# Copyright (c) 2009-2012 Eric Bélanger -# Copyright (c) 2009-2012 Pierre Schmitz -# Copyright (c) 2010 Byron Clark -# Copyright (c) 2011 Ionut Biru -# Copyright (c) 2011 Lukas Fleischer -# Copyright (c) 2011-2012 Florian Pritz -# Copyright (c) 2011-2013 Jan Alexander Steffens (heftig) -# Copyright (c) 2013 Sébastien Luttringer +# Copyright (C) 2007 Armin Luntzer +# Copyright (C) 2007 Jason Chu +# Copyright (C) 2007, 2011 Dan McGee +# Copyright (C) 2007-2008 Travis Willard +# Copyright (C) 2007-2009 Aaron Griffin +# Copyright (C) 2008 Simo Leone +# Copyright (C) 2009 Biru Ionut +# Copyright (C) 2009 Biru Ionut +# Copyright (C) 2009 Evangelos Foutras +# Copyright (C) 2009 Francois Charette +# Copyright (C) 2009 Nezmer +# Copyright (C) 2009 Ronald van Haren +# Copyright (C) 2009-2011 Andrea Scarpino +# Copyright (C) 2009-2012 Allan McRae +# Copyright (C) 2009-2012 Eric Bélanger +# Copyright (C) 2009-2012 Pierre Schmitz +# Copyright (C) 2010 Byron Clark +# Copyright (C) 2011 Ionut Biru +# Copyright (C) 2011 Lukas Fleischer +# Copyright (C) 2011-2012 Florian Pritz +# Copyright (C) 2011-2013 Jan Alexander Steffens (heftig) +# Copyright (C) 2013 Sébastien Luttringer # # Because of the code from makechrootpkg, this file is GPLv2, instead of GPLv3 # like most of libretools. -- 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/fullpkg/fullpkg-find | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/fullpkg/fullpkg-find') diff --git a/src/fullpkg/fullpkg-find b/src/fullpkg/fullpkg-find index 8bd630c..009bb86 100755 --- a/src/fullpkg/fullpkg-find +++ b/src/fullpkg/fullpkg-find @@ -1,10 +1,10 @@ #!/usr/bin/env bash # set -x # uncomment for debug -# Copyright (C) 2011-2012 Joshua I. Haase H. (xihh) -# Copyright (C) 2011-2012 Nicolás Reynolds +# Copyright (C) 2011-2012 Joshua Ismael Haase Hernández (xihh) +# Copyright (C) 2011-2012 Nicolás Reynolds # Copyright (C) 2012 Michał Masłowski -# Copyright (C) 2012-2014 Luke Shumaker +# Copyright (C) 2012-2014 Luke Shumaker # # The copy_files() function is taken from makechrootpkg: # Copyright (C) 2007 Armin Luntzer @@ -13,8 +13,7 @@ # Copyright (C) 2007-2008 Travis Willard # Copyright (C) 2007-2009 Aaron Griffin # Copyright (C) 2008 Simo Leone -# Copyright (C) 2009 Biru Ionut -# Copyright (C) 2009 Biru Ionut +# Copyright (C) 2009 Biru Ionut # Copyright (C) 2009 Evangelos Foutras # Copyright (C) 2009 Francois Charette # Copyright (C) 2009 Nezmer @@ -33,6 +32,8 @@ # Because of the code from makechrootpkg, this file is GPLv2, instead of GPLv3 # like most of libretools. # +# License: GNU GPLv2 +# # 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 2 of the License. -- 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/fullpkg/fullpkg-find | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/fullpkg/fullpkg-find') diff --git a/src/fullpkg/fullpkg-find b/src/fullpkg/fullpkg-find index 009bb86..c12888a 100755 --- a/src/fullpkg/fullpkg-find +++ b/src/fullpkg/fullpkg-find @@ -4,7 +4,7 @@ # Copyright (C) 2011-2012 Joshua Ismael Haase Hernández (xihh) # Copyright (C) 2011-2012 Nicolás Reynolds # Copyright (C) 2012 Michał Masłowski -# Copyright (C) 2012-2014 Luke Shumaker +# Copyright (C) 2013-2014 Luke Shumaker # # The copy_files() function is taken from makechrootpkg: # Copyright (C) 2007 Armin Luntzer -- cgit v1.2.3-2-g168b