Commit 42d821ef authored by Eric Bélanger's avatar Eric Bélanger Committed by Pierre Schmitz
Browse files

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: default avatarEric Bélanger <snowmaniscool@gmail.com>
Signed-off-by: default avatarPierre Schmitz <pierre@archlinux.de>
parent aea075d8

archco.in

+1 −1
Original line number Diff line number Diff line
@@ -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

archrelease.in

+2 −2
Original line number Diff line number Diff line
@@ -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

commitpkg.in

+11 −11
Original line number Diff line number Diff line
@@ -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

find-libdeps.in

+1 −1
Original line number Diff line number Diff line
@@ -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

makechrootpkg.in

+3 −3
Original line number Diff line number Diff line
@@ -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