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/treepkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/treepkg') diff --git a/src/treepkg b/src/treepkg index e509dac..8879e54 100755 --- a/src/treepkg +++ b/src/treepkg @@ -22,7 +22,7 @@ load_files libretools check_vars libretools HOOKPREBUILD FULLBUILDCMD HOOKLOCALRELEASE || exit 1 load_files makepkg -term_title "$(basename $0)" +term_title "${0##*/}" # End inmediately but print an useful message trap_exit() { -- 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/treepkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/treepkg') diff --git a/src/treepkg b/src/treepkg index 8879e54..1826c8f 100755 --- a/src/treepkg +++ b/src/treepkg @@ -1,6 +1,6 @@ #!/usr/bin/env bash #set -x -# (c) 2012 Nicolás Reynolds +# Copyright (C) 2012 Nicolás Reynolds # # 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 -- cgit v1.2.3-2-g168b From 6963eb95d8d29b84d9dc8a1f6b4095ebe1317a68 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 5 Mar 2014 09:59:59 -0500 Subject: touch up treepkg --- src/treepkg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/treepkg') diff --git a/src/treepkg b/src/treepkg index 73ef93b..bfe2163 100755 --- a/src/treepkg +++ b/src/treepkg @@ -114,7 +114,7 @@ BUILD=${B:-true} CLEANUP=${C:-true} # Skip BUILDORDER creation and build anything on BUILDDIR BUILDNOW=${N:-false} -IGNORE=${I:-} +IGNORE=(${I}) if [[ ! -z $1 ]] && [[ $DEPTH -eq 0 ]]; then BUILDNOW=true @@ -220,7 +220,7 @@ if [[ ${DEPTH} -eq 0 ]]; then ${VERBOSE} || echo "${BUILDORDER}" || true fi - if (( CLEANUP )) ; then + if ${CLEANUP} ; then msg2 "Removing %s" "${BUILDDIR}" rm -rf "${BUILDDIR}" fi -- cgit v1.2.3-2-g168b From 64b427c2449eb45ec945afd09cced57c8a7d7e4e Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 5 Mar 2014 10:53:45 -0500 Subject: treepkg: make HOOK* settings optional, update documentation on the HOOK*s --- src/treepkg | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'src/treepkg') diff --git a/src/treepkg b/src/treepkg index bfe2163..4dc29dc 100755 --- a/src/treepkg +++ b/src/treepkg @@ -19,7 +19,9 @@ source libremessages source $(librelib conf.sh) load_files libretools -check_vars libretools HOOKPREBUILD FULLBUILDCMD HOOKLOCALRELEASE || exit 1 +check_vars libretools FULLBUILDCMD || exit 1 +# The following variables are actually optional +#check_vars libretools HOOKPREBUILD HOOKLOCALRELEASE || exit 1 load_files makepkg term_title "${0##*/}" @@ -205,11 +207,16 @@ if [[ ${DEPTH} -eq 0 ]]; then pushd "${BUILDDIR}/${_pkg}" >/dev/null sudo -E pacman -Syu --noconfirm - ${HOOKPREBUILD} + if [[ -n "${HOOKPREBUILD:-}" ]]; then + ${HOOKPREBUILD} + fi ${FULLBUILDCMD} + # Run local release hook with $1 = $repo - ${HOOKLOCALRELEASE} $(egrep ";${_pkg#*_};" "${BUILDORDER}" | cut -d';' -f6) + if [[ -n "${HOOKLOCALRELEASE:-}" ]]; then + ${HOOKLOCALRELEASE} $(egrep ";${_pkg#*_};" "${BUILDORDER}" | cut -d';' -f6) + fi touch built_ok popd >/dev/null -- 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/treepkg | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/treepkg') diff --git a/src/treepkg b/src/treepkg index 4dc29dc..a23edbf 100755 --- a/src/treepkg +++ b/src/treepkg @@ -1,6 +1,8 @@ #!/usr/bin/env bash -#set -x -# Copyright (C) 2012 Nicolás Reynolds + +# Copyright (C) 2012 Nicolás Reynolds +# +# 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 -- 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/treepkg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/treepkg') diff --git a/src/treepkg b/src/treepkg index a23edbf..9d3c0c3 100755 --- a/src/treepkg +++ b/src/treepkg @@ -1,6 +1,7 @@ #!/usr/bin/env bash -# Copyright (C) 2012 Nicolás Reynolds +# Copyright (C) 2012-2013 Nicolás Reynolds +# Copyright (C) 2013 Luke Shumaker # # License: GNU GPLv3+ # -- cgit v1.2.3-2-g168b