From ada82c54e5948ae6353d7024151dcc429665a070 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 21 Mar 2014 00:36:23 -0400 Subject: Add usage text to the commands in src/devtools --- src/devtools/checkpkg.patch | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 src/devtools/checkpkg.patch (limited to 'src/devtools/checkpkg.patch') diff --git a/src/devtools/checkpkg.patch b/src/devtools/checkpkg.patch new file mode 100644 index 0000000..fe9568e --- /dev/null +++ b/src/devtools/checkpkg.patch @@ -0,0 +1,43 @@ +--- checkpkg.in 2014-03-20 15:55:50.091249246 -0400 ++++ checkpkg 2014-03-21 00:27:07.318339210 -0400 +@@ -2,7 +2,28 @@ + + shopt -s extglob + +-m4_include(lib/common.sh) ++. $(librelib messages) ++ ++usage() { ++ print 'Usage: %s [-h]' "${0##*/}" ++ print 'Compare a locally built a package with the one in the repositories.' ++ echo ++ prose 'This should be run from a directory containing a ++ PKGBUILD. It searches for a locally built package ++ corresponding to the PKGBUILD, and downloads the last ++ version of that package from the pacman repositories. ++ It then compares the list of .so files provided by each ++ version of the package. It does this for each part of ++ a split package.' ++} ++ ++if [[ $1 = '-h' ]]; then ++ usage ++ exit 0 ++elif [[ $# -gt 0 ]]; then ++ usage >&2 ++ exit 1 ++fi + + # Source makepkg.conf; fail if it is not found + if [[ -r '/etc/makepkg.conf' ]]; then +@@ -17,7 +38,9 @@ + fi + + if [[ ! -f PKGBUILD ]]; then +- die 'This must be run in the directory of a built package.' ++ error 'This must be run in the directory of a built package.' ++ usage >&2 ++ exit 1 + fi + + . ./PKGBUILD -- 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/devtools/checkpkg.patch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/devtools/checkpkg.patch') diff --git a/src/devtools/checkpkg.patch b/src/devtools/checkpkg.patch index fe9568e..2e3bb63 100644 --- a/src/devtools/checkpkg.patch +++ b/src/devtools/checkpkg.patch @@ -1,6 +1,8 @@ ---- checkpkg.in 2014-03-20 15:55:50.091249246 -0400 -+++ checkpkg 2014-03-21 00:27:07.318339210 -0400 -@@ -2,7 +2,28 @@ +--- checkpkg.in 2014-03-21 13:59:31.849658036 -0400 ++++ checkpkg.ugly 2014-03-21 14:20:52.340291982 -0400 +@@ -1,8 +1,30 @@ + #!/bin/bash ++# License: Unspecified shopt -s extglob @@ -30,7 +32,7 @@ # Source makepkg.conf; fail if it is not found if [[ -r '/etc/makepkg.conf' ]]; then -@@ -17,7 +38,9 @@ +@@ -17,7 +39,9 @@ fi if [[ ! -f PKGBUILD ]]; then -- cgit v1.2.3-2-g168b