diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-11-28 11:12:10 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-11-28 11:12:10 -0500 |
| commit | f22c26de81c0ac55c2f521de77282bc3cbcf9263 (patch) | |
| tree | 0fa3c960ae13a916673de1830362606ff0455be0 | |
| parent | ac8fa7ff7ed22805ac421d5b6fa2ee6e8e0c7927 (diff) | |
| parent | 8c0ab05d635c66feb07ec102515f02d13f9af2d6 (diff) | |
Merge branch 'complete'
Conflicts:
Makefile
archbuild.in
archco.in
commitpkg.in
crossrepomove.in
rebuildpkgs.in
| -rw-r--r-- | checkpkg.in | 2 | ||||
| -rw-r--r-- | finddeps.in | 2 | ||||
| -rw-r--r-- | makechrootpkg.in | 2 | ||||
| -rw-r--r-- | mkarchroot.in | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/checkpkg.in b/checkpkg.in index d3a63ba..95bf049 100644 --- a/checkpkg.in +++ b/checkpkg.in @@ -58,7 +58,7 @@ for _pkgname in "${pkgname[@]}"; do elif [[ -f "$STARTDIR/$oldpkg" ]]; then ln -s "$STARTDIR/$oldpkg" "$oldpkg" else - wget --quiet "$pkgurl" + curl -fsLC - --retry 3 --retry-delay 3 -o "$oldpkg" "$pkgurl" fi fi 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 <depname>' + echo 'Usage: finddeps <depname>' 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 b635432..05286c6 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 <chrootdir> [--] [makepkg args]" + echo "Usage: ${0##*/} [options] -r <chrootdir> [--] [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 308f5d3..7b6adf7 100644 --- a/mkarchroot.in +++ b/mkarchroot.in @@ -23,7 +23,7 @@ APPNAME=$(basename "${0}") # usage: usage <exitvalue> usage() { - echo "usage ${APPNAME} [options] working-dir [package-list | app]" + echo "Usage: ${APPNAME} [options] working-dir [package-list | app]" echo ' options:' echo ' -r <app> Run "app" within the context of the chroot' echo ' -u Update the chroot via pacman' @@ -47,7 +47,7 @@ while getopts 'r:ufnhC:M:c:' arg; do n) NOCOPY='y' ;; c) cache_dir="$OPTARG" ;; N) NONETWORK='y' ;; - h|?) usage 0 ;; + h|?) usage ;; *) error "invalid argument '${arg}'"; usage ;; esac done |