summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvangelos Foutras <foutrelis@gmail.com>2009-09-25 10:02:33 +0200
committerAaron Griffin <aaronmgriffin@gmail.com>2009-10-06 18:25:09 +0200
commit169c33195fd3f5476e9b0f12e61f9f9754638426 (patch)
tree348887698ada37615f30ef84ebc096f0f4eb06d5
parent86416b25b3593e3b413a2012c5190f5e39593187 (diff)
downloaddevtools-169c33195fd3f5476e9b0f12e61f9f9754638426.tar.gz
devtools-169c33195fd3f5476e9b0f12e61f9f9754638426.tar.xz
commitpkg: tidy quotes and remove unneeded braces
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-rwxr-xr-xcommitpkg26
1 files changed, 13 insertions, 13 deletions
diff --git a/commitpkg b/commitpkg
index 7fb54dc..8413058 100755
--- a/commitpkg
+++ b/commitpkg
@@ -29,14 +29,14 @@ if [ -r ~/.makepkg.conf ]; then
source ~/.makepkg.conf
fi
-cmd=$(basename $0)
+cmd=$(basename "$0")
if [ ! -f PKGBUILD ]; then
abort "No PKGBUILD file"
fi
source PKGBUILD
-pkgbase=${pkgbase:-${pkgname[0]}}
+pkgbase=${pkgbase:-$pkgname}
# set up repo-specific opts depending on how we were called
server="gerolde.archlinux.org"
@@ -63,17 +63,17 @@ fi
# see if any limit options were passed, we'll send them to SCP
unset scpopts
if [ "$1" = "-l" ]; then
- scpopts="$1 $2"
+ scpopts="-l $2"
shift 2
fi
for CARCH in ${arch[@]}; do
echo "===> Uploading to $repo-$CARCH"
for _pkgname in ${pkgname[@]}; do
- pkgfile=${_pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
+ pkgfile=$_pkgname-$pkgver-$pkgrel-$CARCH$PKGEXT
- if [ ! -f $pkgfile -a -f $PKGDEST/$pkgfile ]; then
- pkgfile=$PKGDEST/$pkgfile
+ if [ ! -f $pkgfile -a -f "$PKGDEST/$pkgfile" ]; then
+ pkgfile="$PKGDEST/$pkgfile"
elif [ ! -f $pkgfile ]; then
echo "File $pkgfile doesn't exist"
# skip to next architecture
@@ -81,12 +81,12 @@ for CARCH in ${arch[@]}; do
fi
# combine what we know into a variable
- uploadto="staging/${repo}/$(basename ${pkgfile})"
+ uploadto=staging/$repo/$(basename "$pkgfile")
# don't re-upload the same package (useful for -any sub packages)
- if ! package_verify "${pkgfile}" ${server} "${uploadto}"; then
- scp ${scpopts} "${pkgfile}" "${server}:${uploadto}" || abort
+ if ! package_verify "$pkgfile" $server "$uploadto"; then
+ scp $scpopts "$pkgfile" $server:"$uploadto" || abort
fi
- if ! package_verify "${pkgfile}" ${server} "${uploadto}"; then
+ if ! package_verify "$pkgfile" $server "$uploadto"; then
abort "File got corrupted during upload, cancelled."
else
echo "File integrity okay."
@@ -94,9 +94,9 @@ for CARCH in ${arch[@]}; do
echo "===> Uploaded $pkgfile"
done
- if [ "$1" != "" ]; then
+ if [ -n "$1" ]; then
svn commit -m "upgpkg: $pkgbase $pkgver-$pkgrel
- $1" > /dev/null || abort
+ $1" >/dev/null || abort
echo "===> Commited with message:
upgpkg: $pkgbase $pkgver-$pkgrel
$1"
@@ -109,7 +109,7 @@ for CARCH in ${arch[@]}; do
done
if [ "${arch[*]}" == "any" ]; then
- if [ -d ../repos/${repo}-i686 -a -d ../repos/${repo}-x86_64 ]; then
+ if [ -d ../repos/$repo-i686 -a -d ../repos/$repo-x86_64 ]; then
pushd ../repos/
svn rm $repo-i686
svn rm $repo-x86_64