diff options
author | Dubiousjim <dubiousjim@gmail.com> | 2013-07-05 00:21:37 -0400 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-07-09 07:12:56 +0000 |
commit | b2d6b47be1ae42ff6271cfa31283a518ea5949ef (patch) | |
tree | 1b7de05e4c09f8dd678f31cff96e31ed51960467 /checkapk.in | |
parent | f15c630cb888dad70809efc12644a4570372320b (diff) | |
download | abuild-b2d6b47be1ae42ff6271cfa31283a518ea5949ef.tar.gz abuild-b2d6b47be1ae42ff6271cfa31283a518ea5949ef.tar.bz2 abuild-b2d6b47be1ae42ff6271cfa31283a518ea5949ef.tar.xz abuild-b2d6b47be1ae42ff6271cfa31283a518ea5949ef.zip |
various: s/echo/msg/, s/echo/error/, tweak error messages
Diffstat (limited to 'checkapk.in')
-rw-r--r-- | checkapk.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/checkapk.in b/checkapk.in index 2953b8b..d3e2988 100644 --- a/checkapk.in +++ b/checkapk.in @@ -36,14 +36,14 @@ if ! [ -f "$abuild_conf" ] && ! [ -f "$abuild_userconf" ]; then fi if ! [ -f APKBUILD ]; then - die 'This must be run in the directory of a built package.' + die 'must be run in the directory of a built package' fi . ./APKBUILD startdir="$PWD" tmpdir=$(mktemp -d -t checkpkg-script.XXXXXX) -cd "$tmpdir" || die "Failed to create temp dir" +cd "$tmpdir" || die "failed to create temp dir" for i in $pkgname $subpackages; do _pkgname=${i%:*} @@ -57,19 +57,19 @@ for i in $pkgname $subpackages; do break fi done - [ -f "$filepath" ] || die "could not find $pkgfile" + [ -f "$filepath" ] || die "can't find $pkgfile" # generate a temp repositories file with only the http repos grep ^http: /etc/apk/repositories > $tmpdir/repositories oldpkg=$(apk fetch --repositories-file $tmpdir/repositories --simulate 2>&1 | sed 's/^Downloading //') if [ "${oldpkg}" = "${pkg}" ]; then - die "The built package ($_pkgname) is the one in the repo right now!" + die "the built package ($_pkgname) is already in the repo" fi apk fetch --repositories-file $tmpdir/repositories --stdout $_pkgname \ | tar -zt | grep -v '^\.SIGN\.' | sort > filelist-$_pkgname-old \ - || die "Failed to download old pkg. Maybe run 'apk update'?" + || die "failed to download old pkg, maybe run 'apk update'?" tar -ztf "$filepath" | grep -v '^\.SIGN\.' | sort > "filelist-$_pkgname" |