[arch-projects] [devtools][PATCH] Capitalize output messages
Eric Bélanger
snowmaniscool at gmail.com
Tue Nov 1 20:38:42 EDT 2011
Some of the output/error messages were capitalized, some were
not. This patch capitalize everything for consistency sake. Other
minor changes were done to the messages like removing the superfluous
"error:" from die messages and adding a final period to messages that
were complete sentences as appropriate.
Signed-off-by: Eric Bélanger <snowmaniscool at gmail.com>
---
archco.in | 2 +-
archrelease.in | 4 ++--
commitpkg.in | 22 +++++++++++-----------
find-libdeps.in | 2 +-
makechrootpkg.in | 6 +++---
mkarchroot.in | 16 ++++++++--------
6 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/archco.in b/archco.in
index a1e5f96..be026b1 100644
--- a/archco.in
+++ b/archco.in
@@ -15,7 +15,7 @@ case $scriptname in
communityco)
SVNURL="svn+ssh://aur.archlinux.org/srv/svn-packages";;
*)
- die "error: couldn't find svn url for $scriptname"
+ die "Couldn't find svn url for $scriptname"
;;
esac
diff --git a/archrelease.in b/archrelease.in
index 6fccfc9..40b6c09 100644
--- a/archrelease.in
+++ b/archrelease.in
@@ -36,7 +36,7 @@ for file in "${known_files[@]}"; do
done
for tag in "$@"; do
- stat_busy "copying ${trunk} to ${tag}"
+ stat_busy "Copying ${trunk} to ${tag}"
if [[ -d repos/$tag ]]; then
declare -a trash
@@ -56,7 +56,7 @@ for tag in "$@"; do
stat_done
done
-stat_busy "releasing package"
+stat_busy "Releasing package"
printf -v tag_list ", %s" "$@"; tag_list="${tag_list#, }"
svn commit -q -m "archrelease: copy ${trunk} to $tag_list" || abort
stat_done
diff --git a/commitpkg.in b/commitpkg.in
index d7f7513..2dc9f19 100644
--- a/commitpkg.in
+++ b/commitpkg.in
@@ -4,9 +4,9 @@ m4_include(lib/common.sh)
getpkgfile() {
if [[ ${#} -ne 1 ]]; then
- die 'ERROR: No canonical package found!'
+ die 'No canonical package found!'
elif [ ! -f "${1}" ]; then
- die "ERROR: Package ${1} not found!"
+ die "Package ${1} not found!"
fi
echo ${1}
@@ -83,15 +83,15 @@ while getopts ':l:a:' flag; do
case $flag in
l) rsyncopts+=("--bwlimit=$2") ;;
a) commit_arch=$2 ;;
- :) die "option requires an argument -- '$OPTARG'" ;;
- \?) die "invalid option -- '$OPTARG'" ;;
+ :) die "Option requires an argument -- '$OPTARG'" ;;
+ \?) die "Invalid option -- '$OPTARG'" ;;
esac
done
shift $(( OPTIND - 1 ))
if [ -n "$(svn status -q)" ]; then
if [ -n "$1" ]; then
- stat_busy 'committing changes to trunk'
+ stat_busy 'Committing changes to trunk'
svn commit -q -m "${msgtemplate}${1}" || die
stat_done
else
@@ -108,7 +108,7 @@ if [ -n "$(svn status -q)" ]; then
vi "$msgfile"
fi
[ -s "$msgfile" ] || die
- stat_busy 'committing changes to trunk'
+ stat_busy 'Committing changes to trunk'
svn commit -q -F "$msgfile" || die
unlink "$msgfile"
stat_done
@@ -164,26 +164,26 @@ else
fi
if [[ ${#uploads[*]} -gt 0 ]]; then
- msg 'uploading all package and signature files'
+ msg 'Uploading all package and signature files'
rsync "${rsyncopts[@]}" "${uploads[@]}" "$server:staging/$repo/" || die
fi
if [ "${arch[*]}" == 'any' ]; then
if [ -d ../repos/$repo-i686 -a -d ../repos/$repo-x86_64 ]; then
pushd ../repos/ >/dev/null
- stat_busy "removing $repo-i686 and $repo-x86_64"
+ stat_busy "Removing $repo-i686 and $repo-x86_64"
svn rm $repo-i686
svn rm $repo-x86_64
- svn commit -q -m "removed $repo-i686 and $repo-x86_64 for $pkgname"
+ svn commit -q -m "Removed $repo-i686 and $repo-x86_64 for $pkgname"
stat_done
popd >/dev/null
fi
else
if [ -d ../repos/$repo-any ]; then
pushd ../repos/ >/dev/null
- stat_busy "removing $repo-any"
+ stat_busy "Removing $repo-any"
svn rm $repo-any
- svn commit -q -m "removed $repo-any for $pkgname"
+ svn commit -q -m "Removed $repo-any for $pkgname"
stat_done
popd >/dev/null
fi
diff --git a/find-libdeps.in b/find-libdeps.in
index 3f44903..efd9bf3 100644
--- a/find-libdeps.in
+++ b/find-libdeps.in
@@ -15,7 +15,7 @@ script_mode=${0##*/find-lib}
case $script_mode in
deps|provides) true;;
- *) die "unknown mode $script_mode" ;;
+ *) die "Unknown mode $script_mode" ;;
esac
if [[ -z $1 ]]; then
diff --git a/makechrootpkg.in b/makechrootpkg.in
index ed71c1c..d128ff4 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -114,7 +114,7 @@ umask 0022
# Note this is the same FD number as in mkarchroot
exec 9>"$copydir.lock"
if ! flock -n 9; then
- stat_busy "locking chroot copy '$copy'"
+ stat_busy "Locking chroot copy '$copy'"
flock 9
stat_done
fi
@@ -125,12 +125,12 @@ if [[ ! -d $copydir ]] || $clean_first; then
exec 8>"$chrootdir/root.lock"
if ! flock -sn 8; then
- stat_busy "locking clean chroot"
+ stat_busy "Locking clean chroot"
flock -s 8
stat_done
fi
- stat_busy 'creating clean working copy'
+ stat_busy 'Creating clean working copy'
use_rsync=false
if type -P btrfs >/dev/null; then
[[ -d $copydir ]] && btrfs subvolume delete "$copydir" &>/dev/null
diff --git a/mkarchroot.in b/mkarchroot.in
index 9361bef..6238979 100644
--- a/mkarchroot.in
+++ b/mkarchroot.in
@@ -48,21 +48,21 @@ while getopts 'r:ufnhC:M:c:' arg; do
done
if [ "$EUID" != '0' ]; then
- die 'this script must be run as root.'
+ die 'This script must be run as root.'
fi
shift $(($OPTIND - 1))
if [ "$RUN" = '' -a $# -lt 2 ]; then
- die 'you must specify a directory and one or more packages'
+ die 'You must specify a directory and one or more packages.'
elif [ $# -lt 1 ]; then
- die 'you must specify a directory'
+ die 'You must specify a directory.'
fi
working_dir="$(readlink -f ${1})"
shift 1
-[ "${working_dir}" = '' ] && die 'please specify a working directory'
+[ "${working_dir}" = '' ] && die 'Please specify a working directory.'
if [ -z "$cache_dir" ]; then
cache_conf=${working_dir}/etc/pacman.conf
@@ -149,7 +149,7 @@ chroot_lock () {
# Lock the chroot. Take note of the FD number.
if ! flock -n 9; then
- stat_busy "locking chroot"
+ stat_busy "Locking chroot"
flock 9
stat_done
fi
@@ -161,7 +161,7 @@ if [ "$RUN" != "" ]; then
# run chroot {{{
#Sanity check
if [ ! -f "${working_dir}/.arch-chroot" ]; then
- die "'${working_dir}' does not appear to be a Arch chroot"
+ die "'${working_dir}' does not appear to be a Arch chroot."
fi
chroot_lock
@@ -174,7 +174,7 @@ if [ "$RUN" != "" ]; then
else
# {{{ build chroot
if [ -e "${working_dir}" -a "${FORCE}" = "n" ]; then
- die "working dir '${working_dir}' already exists - try using -f"
+ die "Working directory '${working_dir}' already exists - try using -f"
fi
if { type -P btrfs && btrfs subvolume create "${working_dir}"; } &>/dev/null; then
@@ -198,7 +198,7 @@ else
op="${op}f"
fi
if ! pacman ${op} ${pacargs} $@; then
- die 'failed to install all packages'
+ die 'Failed to install all packages'
fi
fi
--
1.7.7.1
More information about the arch-projects
mailing list