From 41b54bdde5112e884c8577a07805db9c9d2bdb7b Mon Sep 17 00:00:00 2001 From: Eric Bélanger Date: Mon, 12 Nov 2012 21:25:30 -0500 Subject: mkarchroot: Remove unnecessary parameter for usage function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes FS#28973 Signed-off-by: Eric Bélanger Signed-off-by: Pierre Schmitz --- mkarchroot.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkarchroot.in') diff --git a/mkarchroot.in b/mkarchroot.in index 76ad840..6a86231 100644 --- a/mkarchroot.in +++ b/mkarchroot.in @@ -44,7 +44,7 @@ while getopts 'r:ufnhC:M:c:' arg; do M) makepkg_conf="$OPTARG" ;; n) NOCOPY='y' ;; c) cache_dir="$OPTARG" ;; - h|?) usage 0 ;; + h|?) usage ;; *) error "invalid argument '${arg}'"; usage ;; esac done -- cgit v1.2.3-70-g09d2 From 890baf68915294d27dfb11efc7a889e21e46ec2b Mon Sep 17 00:00:00 2001 From: Eric Bélanger Date: Thu, 15 Nov 2012 09:22:50 -0500 Subject: Make sure the usage functions are consistent MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The usage messages now begins with a "Usage:", i.e. capitalized and with a colon. Fixes FS#26956. Signed-off-by: Eric Bélanger Signed-off-by: Pierre Schmitz --- archbuild.in | 2 +- commitpkg.in | 4 ++-- finddeps.in | 2 +- makechrootpkg.in | 2 +- mkarchroot.in | 2 +- rebuildpkgs.in | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) (limited to 'mkarchroot.in') diff --git a/archbuild.in b/archbuild.in index 00234f3..10d33b8 100644 --- a/archbuild.in +++ b/archbuild.in @@ -18,7 +18,7 @@ chroots='/var/lib/archbuild' clean_first=false usage() { - echo "usage $cmd" + echo "Usage: $cmd" echo ' -c Recreate the chroot before building' echo ' -r Create chroots in this directory' exit 1 diff --git a/commitpkg.in b/commitpkg.in index e31838c..d9ee0aa 100644 --- a/commitpkg.in +++ b/commitpkg.in @@ -42,7 +42,7 @@ pkgbase=${pkgbase:-$pkgname} case "$cmd" in commitpkg) if (( $# == 0 )); then - die 'usage: commitpkg [-f] [-s server] [-l limit] [-a arch] [commit message]' + die 'Usage: commitpkg [-f] [-s server] [-l limit] [-a arch] [commit message]' fi repo="$1" shift @@ -51,7 +51,7 @@ case "$cmd" in repo="${cmd%pkg}" ;; *) - die 'usage: commitpkg [-f] [-s server] [-l limit] [-a arch] [commit message]' + die 'Usage: commitpkg [-f] [-s server] [-l limit] [-a arch] [commit message]' ;; esac diff --git a/finddeps.in b/finddeps.in index 1526fb8..7a2a3fb 100644 --- a/finddeps.in +++ b/finddeps.in @@ -8,7 +8,7 @@ m4_include(lib/common.sh) match=$1 if [[ -z $match ]]; then - echo 'usage: finddeps ' + echo 'Usage: finddeps ' echo '' echo 'Find packages that depend on a given depname.' echo 'Run this script from the top-level directory of your ABS tree.' diff --git a/makechrootpkg.in b/makechrootpkg.in index 6c0b013..762ad7b 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -28,7 +28,7 @@ default_copy=$USER src_owner=${SUDO_USER:-$USER} usage() { - echo "usage ${0##*/} [options] -r [--] [makepkg args]" + echo "Usage: ${0##*/} [options] -r [--] [makepkg args]" echo ' Run this script in a PKGBUILD dir to build a package inside a' echo ' clean chroot. All unrecognized arguments passed to this script' echo ' will be passed to makepkg.' diff --git a/mkarchroot.in b/mkarchroot.in index 6a86231..cb95f8e 100644 --- a/mkarchroot.in +++ b/mkarchroot.in @@ -22,7 +22,7 @@ APPNAME=$(basename "${0}") # usage: usage usage() { - echo "usage ${APPNAME} [options] working-dir [package-list | app]" + echo "Usage: ${APPNAME} [options] working-dir [package-list | app]" echo ' options:' echo ' -r Run "app" within the context of the chroot' echo ' -u Update the chroot via pacman' diff --git a/rebuildpkgs.in b/rebuildpkgs.in index f7b1612..a4c8969 100644 --- a/rebuildpkgs.in +++ b/rebuildpkgs.in @@ -12,7 +12,7 @@ m4_include(lib/common.sh) if (( $# < 1 )); then - echo "usage: $(basename $0) " + echo "Usage: $(basename $0) " echo " example: $(basename $0) ~/chroot readline bash foo bar baz" exit 1 fi -- cgit v1.2.3-70-g09d2