summaryrefslogtreecommitdiff
path: root/commitpkg.in
diff options
context:
space:
mode:
authorEric Bélanger <snowmaniscool@gmail.com>2011-11-01 20:38:42 -0400
committerPierre Schmitz <pierre@archlinux.de>2011-11-04 19:33:29 +0100
commit42d821ef7b9cfdf4a401563a9351820499620afa (patch)
treef01e902c854e1ada6dcf0865c212b71810e7c61a /commitpkg.in
parentaea075d817b579fa5b4f45a10cdce1c7f822c571 (diff)
Capitalize output messages
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@gmail.com> Signed-off-by: Pierre Schmitz <pierre@archlinux.de>
Diffstat (limited to 'commitpkg.in')
-rw-r--r--commitpkg.in22
1 files changed, 11 insertions, 11 deletions
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