summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJason St. John <jstjohn@purdue.edu>2013-11-08 00:44:40 -0500
committerAllan McRae <allan@archlinux.org>2013-11-15 11:02:27 +1000
commit230bd5c2fd11f6256e1ab16c2e5997a8d8228461 (patch)
treeab33d063641bb3f8f3998caa3aea4db92d8989b7 /scripts
parentb7b3f9c5e7903272bef32792ab28615f434d3ec8 (diff)
downloadpacman-230bd5c2fd11f6256e1ab16c2e5997a8d8228461.tar.xz
Fix whitespace and other formatting issues
This commit: -- replaces space-based indents with tabs per the coding standards -- removes extraneous whitespace (e.g. extra spaces between function args) -- adds missing braces for a one-line if statement Signed-off-by: Jason St. John <jstjohn@purdue.edu>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/makepkg.sh.in6
-rw-r--r--scripts/pacman-optimize.sh.in4
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 86b3d4de..c1c09006 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1336,8 +1336,8 @@ extract_sources() {
for netfile in "${source[@]}"; do
local file=$(get_filename "$netfile")
if in_array "$file" "${noextract[@]}"; then
- #skip source files in the noextract=() array
- # these are marked explicitly to NOT be extracted
+ # skip source files in the noextract=() array
+ # these are marked explicitly to NOT be extracted
continue
fi
local proto=$(get_protocol "$netfile")
@@ -2488,7 +2488,7 @@ usage() {
printf -- "$(gettext "Options:")\n"
printf -- "$(gettext " -A, --ignorearch Ignore incomplete %s field in %s")\n" "arch" "$BUILDSCRIPT"
printf -- "$(gettext " -c, --clean Clean up work files after build")\n"
- printf -- "$(gettext " -C, --cleanbuild Remove %s dir before building the package")\n" "\$srcdir/"
+ printf -- "$(gettext " -C, --cleanbuild Remove %s dir before building the package")\n" "\$srcdir/"
printf -- "$(gettext " -d, --nodeps Skip all dependency checks")\n"
printf -- "$(gettext " -e, --noextract Do not extract source files (use existing %s dir)")\n" "\$srcdir/"
printf -- "$(gettext " -f, --force Overwrite existing package")\n"
diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in
index 47fbb492..498bd77a 100644
--- a/scripts/pacman-optimize.sh.in
+++ b/scripts/pacman-optimize.sh.in
@@ -142,8 +142,8 @@ msg "$(gettext "Making and MD5sum'ing the new database...")"
mkdir "$localdb.new"
bsdtar -xpf "$workdir/pacman-db.tar.gz" -C "$localdb.new"
if (( $? )); then
- rm -rf "$workdir"
- die_r "$(gettext "Untar'ing %s failed.")" "$localdb"
+ rm -rf "$workdir"
+ die_r "$(gettext "Untar'ing %s failed.")" "$localdb"
fi
# immediate sync following extraction should get it written continuously on HDD
msg "$(gettext "Syncing database to disk...")"