bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scripts: replace test builtin [ with shell keywords [[ and ((

Browse source 
FS#16623 suggested this change for makepkg; this patch applies it to the
remaining files in the scripts directory.

Signed-off-by: Cedric Staniewski <cedric@gmx.ca>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Cedric Staniewski 2009-11-05 16:55:48 +01:00 • committed by Dan McGee
parent fb310fc01e
commit 5d5070f47d
4 changed files with 65 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
scripts/pacman-optimize.sh.in
View file

@ -74,23 +74,23 @@ die_r() {
# PROGRAM START # PROGRAM START
# determine whether we have gettext; make it a no-op if we do not # determine whether we have gettext; make it a no-op if we do not
if [ ! $(type -t gettext) ]; then if ! type gettext &>/dev/null; then
gettext() { gettext() {
echo "$@" echo "$@"
} }
fi fi
if [ "$1" = "-h" -o "$1" = "--help" ]; then if [[ $1 = "-h" || $1 = "--help" ]]; then
usage usage
exit 0 exit 0
fi fi
if [ "$1" = "-V" -o "$1" = "--version" ]; then if [[ $1 = "-V" || $1 = "--version" ]]; then
version version
exit 0 exit 0
fi fi
if [ "$1" != "" ]; then if [[ -n $1 ]]; then
dbroot="$1" dbroot="$1"
fi fi
@ -99,11 +99,11 @@ if ! type diff >/dev/null 2>&1; then
die "$(gettext "diff tool was not found, please install diffutils.")" die "$(gettext "diff tool was not found, please install diffutils.")"
fi fi
if [ ! -d "$dbroot" ]; then if [[ ! -d $dbroot ]]; then
die "$(gettext "%s does not exist or is not a directory.")" "$dbroot" die "$(gettext "%s does not exist or is not a directory.")" "$dbroot"
fi fi
if [ ! -w "$dbroot" ]; then if [[ ! -w $dbroot ]]; then
die "$(gettext "You must have correct permissions to optimize the database.")" die "$(gettext "You must have correct permissions to optimize the database.")"
fi fi
@ -113,7 +113,7 @@ dbroot="${dbroot%/}"
lockfile="${dbroot}/db.lck" lockfile="${dbroot}/db.lck"
# make sure pacman isn't running # make sure pacman isn't running
if [ -f "$lockfile" ]; then if [[ -f $lockfile ]]; then
die "$(gettext "Pacman lock file was found. Cannot run while pacman is running.")" die "$(gettext "Pacman lock file was found. Cannot run while pacman is running.")"
fi fi
# do not let pacman run while we do this # do not let pacman run while we do this
@ -130,7 +130,7 @@ find "$dbroot" -type f | sort | xargs md5sum > "$workdir/pacsums.old"
msg "$(gettext "Tar'ing up %s...")" "$dbroot" msg "$(gettext "Tar'ing up %s...")" "$dbroot"
cd "$dbroot" cd "$dbroot"
bsdtar -czf "$workdir/pacman-db.tar.gz" ./ bsdtar -czf "$workdir/pacman-db.tar.gz" ./
if [ $? -ne 0 ]; then if (( $? )); then
rm -rf "$workdir" rm -rf "$workdir"
die_r "$(gettext "Tar'ing up %s failed.")" "$dbroot" die_r "$(gettext "Tar'ing up %s failed.")" "$dbroot"
fi fi
@ -139,7 +139,7 @@ fi
msg "$(gettext "Making and MD5sum'ing the new database...")" msg "$(gettext "Making and MD5sum'ing the new database...")"
mkdir "$dbroot.new" mkdir "$dbroot.new"
bsdtar -xpf "$workdir/pacman-db.tar.gz" -C "$dbroot.new" bsdtar -xpf "$workdir/pacman-db.tar.gz" -C "$dbroot.new"
if [ $? -ne 0 ]; then if (( $? )); then
rm -rf "$workdir" rm -rf "$workdir"
die_r "$(gettext "Untar'ing %s failed.")" "$dbroot" die_r "$(gettext "Untar'ing %s failed.")" "$dbroot"
fi fi
@ -152,7 +152,7 @@ find "$dbroot.new" -type f | sort | \
# step 4: compare the sums # step 4: compare the sums
msg "$(gettext "Checking integrity...")" msg "$(gettext "Checking integrity...")"
diff "$workdir/pacsums.old" "$workdir/pacsums.new" >/dev/null 2>&1 diff "$workdir/pacsums.old" "$workdir/pacsums.new" >/dev/null 2>&1
if [ $? -ne 0 ]; then if (( $? )); then
# failed # failed
# leave our pacman-optimize tmpdir for checking to see what doesn't match up # leave our pacman-optimize tmpdir for checking to see what doesn't match up
rm -rf "$dbroot.new" rm -rf "$dbroot.new"
@ -167,7 +167,7 @@ mv "$dbroot" "$dbroot.old" || fail=1
mv "$dbroot.new" "$dbroot" || fail=1 mv "$dbroot.new" "$dbroot" || fail=1
chmod --reference="$dbroot.old" "$dbroot" || fail=1 chmod --reference="$dbroot.old" "$dbroot" || fail=1
chown --reference="$dbroot.old" "$dbroot" || fail=1 chown --reference="$dbroot.old" "$dbroot" || fail=1
if [ $fail -ne 0 ]; then if (( fail )); then
# failure with our directory shuffle # failure with our directory shuffle
die_r "$(gettext "New database substitution failed. Check for $dbroot,\n$dbroot.old, and $dbroot.new directories.")" die_r "$(gettext "New database substitution failed. Check for $dbroot,\n$dbroot.old, and $dbroot.new directories.")"
fi fi

22
scripts/pkgdelta.sh.in
View file

@ -35,7 +35,7 @@ QUIET=0
umask 0022 umask 0022
msg() { msg() {
[ $QUIET -ne 0 ] && return (( QUIET )) && return
local mesg=$1; shift local mesg=$1; shift
printf "==> ${mesg}\n" "$@" >&1 printf "==> ${mesg}\n" "$@" >&1
} }
@ -79,7 +79,7 @@ read_pkginfo()
for line in $(bsdtar -xOf "$1" .PKGINFO 2>/dev/null | for line in $(bsdtar -xOf "$1" .PKGINFO 2>/dev/null |
grep -v "^#" | sed 's|\(\w*\)\s*=\s*\(.*\)|\1="\2"|'); do grep -v "^#" | sed 's|\(\w*\)\s*=\s*\(.*\)|\1="\2"|'); do
eval "$line" eval "$line"
if [ -n "$pkgname" -a -n "$pkgver" -a -n "$arch" ]; then if [[ -n $pkgname && -n $pkgver && -n $arch ]]; then
IFS=$OLDIFS IFS=$OLDIFS
return 0 return 0
fi fi
@ -108,17 +108,17 @@ create_xdelta()
newver="$pkgver" newver="$pkgver"
newarch="$arch" newarch="$arch"
if [ "$oldname" != "$newname" ]; then if [[ $oldname != $newname ]]; then
error "$(gettext "The package names don't match : '%s' and '%s'")" "$oldname" "$newname" error "$(gettext "The package names don't match : '%s' and '%s'")" "$oldname" "$newname"
return 1 return 1
fi fi
if [ "$oldarch" != "$newarch" ]; then if [[ $oldarch != $newarch ]]; then
error "$(gettext "The package architectures don't match : '%s' and '%s'")" "$oldarch" "$newarch" error "$(gettext "The package architectures don't match : '%s' and '%s'")" "$oldarch" "$newarch"
return 1 return 1
fi fi
if [ "$oldver" == "$newver" ]; then if [[ $oldver == $newver ]]; then
error "$(gettext "Both packages have the same version : '%s'")" "$newver" error "$(gettext "Both packages have the same version : '%s'")" "$newver"
return 1 return 1
fi fi
@ -128,12 +128,12 @@ create_xdelta()
local ret=0 local ret=0
xdelta3 -q -f -s "$oldfile" "$newfile" "$deltafile" || ret=$? xdelta3 -q -f -s "$oldfile" "$newfile" "$deltafile" || ret=$?
if [ $ret -ne 0 ]; then if (( ret )); then
error "$(gettext "Delta could not be created.")" error "$(gettext "Delta could not be created.")"
return 1 return 1
else else
msg "$(gettext "Generated delta : '%s'")" "$deltafile" msg "$(gettext "Generated delta : '%s'")" "$deltafile"
[ $QUIET -eq 1 ] && echo "$deltafile" (( QUIET )) && echo "$deltafile"
fi fi
return 0 return 0
} }
@ -142,22 +142,22 @@ case "$1" in
-q|--quiet) QUIET=1; shift ;; -q|--quiet) QUIET=1; shift ;;
esac esac
if [ $# -ne 2 ]; then if (( $# != 2 )); then
usage usage
exit 0 exit 0
fi fi
if [ ! -f "$1" ]; then if [[ ! -f $1 ]]; then
error "$(gettext "File '%s' does not exist")" "$1" error "$(gettext "File '%s' does not exist")" "$1"
exit 0 exit 0
fi fi
if [ ! -f "$2" ]; then if [[ ! -f $2 ]]; then
error "$(gettext "File '%s' does not exist")" "$2" error "$(gettext "File '%s' does not exist")" "$2"
exit 0 exit 0
fi fi
if [ ! "$(type -p xdelta3)" ]; then if ! type xdelta3 &>/dev/null; then
error "$(gettext "Cannot find the xdelta3 binary! Is xdelta3 installed?")" error "$(gettext "Cannot find the xdelta3 binary! Is xdelta3 installed?")"
exit 1 exit 1
fi fi

12
scripts/rankmirrors.sh.in
View file

@ -56,8 +56,8 @@ err() {
# returns the fetching time, or timeout, or unreachable # returns the fetching time, or timeout, or unreachable
gettime() { gettime() {
IFS=' ' output=( $(curl -s -m 10 -w "%{time_total} %{http_code}" "$1" -o/dev/null) ) IFS=' ' output=( $(curl -s -m 10 -w "%{time_total} %{http_code}" "$1" -o/dev/null) )
[[ $? = 28 ]] && echo timeout && return (( $? == 28 )) && echo timeout && return
[[ ${output[1]} -ge 400 || ${output[1]} -eq 0 ]] && echo unreachable && return (( ${output[1]} >= 400 || ! ${output[1]} )) && echo unreachable && return
echo "${output[0]}" echo "${output[0]}"
} }
@ -96,13 +96,13 @@ finaloutput() {
for line in "${sortedarray[@]}"; do for line in "${sortedarray[@]}"; do
echo "${line#* } : ${line% *}" echo "${line#* } : ${line% *}"
((numiterator++)) ((numiterator++))
[[ $NUM -ne 0 && $numiterator -ge $NUM ]] && break (( NUM && numiterator >= NUM )) && break
done done
else else
for line in "${sortedarray[@]}"; do for line in "${sortedarray[@]}"; do
echo "Server = ${line#* }" echo "Server = ${line#* }"
((numiterator++)) ((numiterator++))
[[ $NUM -ne 0 && $numiterator -ge $NUM ]] && break (( NUM && numiterator >= NUM )) && break
done done
fi fi
exit 0 exit 0
@ -112,7 +112,7 @@ finaloutput() {
# Argument parsing # Argument parsing
[[ $1 ]] || usage [[ $1 ]] || usage
while [[ $1 ]]; do while [[ $1 ]]; do
if [[ "${1:0:2}" = -- ]]; then if [[ ${1:0:2} = -- ]]; then
case "${1:2}" in case "${1:2}" in
help) usage ;; help) usage ;;
version) version ;; version) version ;;
@ -142,7 +142,7 @@ while [[ $1 ]]; do
done done
shift $snum shift $snum
fi fi
elif [[ -f "$1" ]]; then elif [[ -f $1 ]]; then
FILE="1" FILE="1"
IFS=$'\n' linearray=( $(<$1) ) IFS=$'\n' linearray=( $(<$1) )
[[ $linearray ]] || err "File is empty." [[ $linearray ]] || err "File is empty."

74
scripts/repo-add.sh.in
View file

@ -42,7 +42,7 @@ msg() {
} }
msg2() { msg2() {
[ $QUIET -ne 0 ] && return (( QUIET )) && return
local mesg=$1; shift local mesg=$1; shift
printf " -> ${mesg}\n" "$@" >&1 printf " -> ${mesg}\n" "$@" >&1
} }
@ -90,7 +90,7 @@ There is NO WARRANTY, to the extent permitted by law.\n")"
# arg2 - List # arg2 - List
# arg3 - File to write to # arg3 - File to write to
write_list_entry() { write_list_entry() {
if [ -n "$2" ]; then if [[ -n $2 ]]; then
echo "%$1%" >>$3 echo "%$1%" >>$3
echo -e $2 >>$3 echo -e $2 >>$3
fi fi
@ -102,7 +102,7 @@ find_pkgentry()
local pkgentry local pkgentry
for pkgentry in $tmpdir/$pkgname*; do for pkgentry in $tmpdir/$pkgname*; do
name=${pkgentry##*/} name=${pkgentry##*/}
if [ "${name%-*-*}" = "$pkgname" ]; then if [[ ${name%-*-*} = $pkgname ]]; then
echo $pkgentry echo $pkgentry
return 0 return 0
fi fi
@ -126,12 +126,12 @@ db_write_delta()
pkgname="$(get_delta_pkgname $deltafile)" pkgname="$(get_delta_pkgname $deltafile)"
pkgentry=$(find_pkgentry $pkgname) pkgentry=$(find_pkgentry $pkgname)
if [ -z "$pkgentry" ]; then if [[ -z $pkgentry ]]; then
return 1 return 1
fi fi
deltas="$pkgentry/deltas" deltas="$pkgentry/deltas"
# create deltas file if it does not already exist # create deltas file if it does not already exist
if [ ! -f "$deltas" ]; then if [[ ! -f $deltas ]]; then
msg2 "$(gettext "Creating 'deltas' db entry...")" msg2 "$(gettext "Creating 'deltas' db entry...")"
echo -e "%DELTAS%" >>$deltas echo -e "%DELTAS%" >>$deltas
fi fi
@ -162,11 +162,11 @@ db_remove_delta()
pkgname="$(get_delta_pkgname $deltafile)" pkgname="$(get_delta_pkgname $deltafile)"
pkgentry=$(find_pkgentry $pkgname) pkgentry=$(find_pkgentry $pkgname)
if [ -z "$pkgentry" ]; then if [[ -z $pkgentry ]]; then
return 1 return 1
fi fi
deltas="$pkgentry/deltas" deltas="$pkgentry/deltas"
if [ ! -f "$deltas" ]; then if [[ ! -f $deltas ]]; then
return 1 return 1
fi fi
if grep -q "$filename" $deltas; then if grep -q "$filename" $deltas; then
@ -219,14 +219,14 @@ db_write_entry()
csize=$(@SIZECMD@ "$pkgfile") csize=$(@SIZECMD@ "$pkgfile")
# ensure $pkgname and $pkgver variables were found # ensure $pkgname and $pkgver variables were found
if [ -z "$pkgname" -o -z "$pkgver" ]; then if [[ -z $pkgname || -z $pkgver ]]; then
error "$(gettext "Invalid package file '%s'.")" "$pkgfile" error "$(gettext "Invalid package file '%s'.")" "$pkgfile"
return 1 return 1
fi fi
cd "$tmpdir" cd "$tmpdir"
if [ -d "$pkgname-$pkgver" ]; then if [[ -d $pkgname-$pkgver ]]; then
warning "$(gettext "An entry for '%s' already existed")" "$pkgname-$pkgver" warning "$(gettext "An entry for '%s' already existed")" "$pkgname-$pkgver"
fi fi
@ -238,30 +238,30 @@ db_write_entry()
cd "$pkgname-$pkgver" cd "$pkgname-$pkgver"
# restore an eventual deltas file # restore an eventual deltas file
[ -f "../$pkgname.deltas" ] && mv "../$pkgname.deltas" deltas [[ -f ../$pkgname.deltas ]] && mv "../$pkgname.deltas" deltas
# create desc entry # create desc entry
msg2 "$(gettext "Creating 'desc' db entry...")" msg2 "$(gettext "Creating 'desc' db entry...")"
echo -e "%FILENAME%\n$(basename "$1")\n" >>desc echo -e "%FILENAME%\n$(basename "$1")\n" >>desc
echo -e "%NAME%\n$pkgname\n" >>desc echo -e "%NAME%\n$pkgname\n" >>desc
[ -n "$pkgbase" ] && echo -e "%BASE%\n$pkgbase\n" >>desc [[ -n $pkgbase ]] && echo -e "%BASE%\n$pkgbase\n" >>desc
echo -e "%VERSION%\n$pkgver\n" >>desc echo -e "%VERSION%\n$pkgver\n" >>desc
[ -n "$pkgdesc" ] && echo -e "%DESC%\n$pkgdesc\n" >>desc [[ -n $pkgdesc ]] && echo -e "%DESC%\n$pkgdesc\n" >>desc
write_list_entry "GROUPS" "$_groups" "desc" write_list_entry "GROUPS" "$_groups" "desc"
[ -n "$csize" ] && echo -e "%CSIZE%\n$csize\n" >>desc [[ -n $csize ]] && echo -e "%CSIZE%\n$csize\n" >>desc
[ -n "$size" ] && echo -e "%ISIZE%\n$size\n" >>desc [[ -n $size ]] && echo -e "%ISIZE%\n$size\n" >>desc
# compute checksums # compute checksums
msg2 "$(gettext "Computing md5 checksums...")" msg2 "$(gettext "Computing md5 checksums...")"
echo -e "%MD5SUM%\n$md5sum\n" >>desc echo -e "%MD5SUM%\n$md5sum\n" >>desc
[ -n "$url" ] && echo -e "%URL%\n$url\n" >>desc [[ -n $url ]] && echo -e "%URL%\n$url\n" >>desc
write_list_entry "LICENSE" "$_licenses" "desc" write_list_entry "LICENSE" "$_licenses" "desc"
[ -n "$arch" ] && echo -e "%ARCH%\n$arch\n" >>desc [[ -n $arch ]] && echo -e "%ARCH%\n$arch\n" >>desc
[ -n "$builddate" ] && echo -e "%BUILDDATE%\n$builddate\n" >>desc [[ -n $builddate ]] && echo -e "%BUILDDATE%\n$builddate\n" >>desc
[ -n "$packager" ] && echo -e "%PACKAGER%\n$packager\n" >>desc [[ -n $packager ]] && echo -e "%PACKAGER%\n$packager\n" >>desc
write_list_entry "REPLACES" "$_replaces" "desc" write_list_entry "REPLACES" "$_replaces" "desc"
[ -n "$force" ] && echo -e "%FORCE%\n" >>desc [[ -n $force ]] && echo -e "%FORCE%\n" >>desc
# create depends entry # create depends entry
msg2 "$(gettext "Creating 'depends' db entry...")" msg2 "$(gettext "Creating 'depends' db entry...")"
@ -283,9 +283,9 @@ db_remove_entry() {
local pkgname=$1 local pkgname=$1
local notfound=1 local notfound=1
local pkgentry=$(find_pkgentry $pkgname) local pkgentry=$(find_pkgentry $pkgname)
while [ -n "$pkgentry" ]; do while [[ -n $pkgentry ]]; do
notfound=0 notfound=0
if [ -f "$pkgentry/deltas" ]; then if [[ -f $pkgentry/deltas ]]; then
mv "$pkgentry/deltas" "$tmpdir/$pkgname.deltas" mv "$pkgentry/deltas" "$tmpdir/$pkgname.deltas"
fi fi
msg2 "$(gettext "Removing existing entry '%s'...")" \ msg2 "$(gettext "Removing existing entry '%s'...")" \
@ -303,16 +303,16 @@ check_repo_db()
CLEAN_LOCK=1 CLEAN_LOCK=1
else else
error "$(gettext "Failed to acquire lockfile: %s.")" "$LOCKFILE" error "$(gettext "Failed to acquire lockfile: %s.")" "$LOCKFILE"
[ -f "$LOCKFILE" ] && error "$(gettext "Held by process %s")" "$(cat $LOCKFILE)" [[ -f $LOCKFILE ]] && error "$(gettext "Held by process %s")" "$(cat $LOCKFILE)"
exit 1 exit 1
fi fi
if [ -f "$REPO_DB_FILE" ]; then if [[ -f $REPO_DB_FILE ]]; then
# there are two situations we can have here- a DB with some entries, # there are two situations we can have here- a DB with some entries,
# or a DB with no contents at all. # or a DB with no contents at all.
if ! bsdtar -tqf "$REPO_DB_FILE" '*/desc' >/dev/null 2>&1; then if ! bsdtar -tqf "$REPO_DB_FILE" '*/desc' >/dev/null 2>&1; then
# check empty case # check empty case
if [ -n "$(bsdtar -tqf "$REPO_DB_FILE" '*' 2>/dev/null)" ]; then if [[ -n $(bsdtar -tqf "$REPO_DB_FILE" '*' 2>/dev/null) ]]; then
error "$(gettext "Repository file '%s' is not a proper pacman database.")" "$REPO_DB_FILE" error "$(gettext "Repository file '%s' is not a proper pacman database.")" "$REPO_DB_FILE"
exit 1 exit 1
fi fi
@ -339,15 +339,15 @@ check_repo_db()
add() add()
{ {
if [ ! -f "$1" ]; then if [[ ! -f $1 ]]; then
error "$(gettext "File '%s' not found.")" "$1" error "$(gettext "File '%s' not found.")" "$1"
return 1 return 1
fi fi
if [ "${1##*.}" == "delta" ]; then if [[ ${1##*.} == "delta" ]]; then
deltafile=$1 deltafile=$1
msg "$(gettext "Adding delta '%s'")" "$deltafile" msg "$(gettext "Adding delta '%s'")" "$deltafile"
if [ ! "$(type -p xdelta3)" ]; then if ! type xdelta3 &>/dev/null; then
error "$(gettext "Cannot find the xdelta3 binary! Is xdelta3 installed?")" error "$(gettext "Cannot find the xdelta3 binary! Is xdelta3 installed?")"
exit 1 exit 1
fi fi
@ -371,7 +371,7 @@ add()
remove() remove()
{ {
if [ "${1##*.}" == "delta" ]; then if [[ ${1##*.} == "delta" ]]; then
deltafile=$1 deltafile=$1
msg "$(gettext "Searching for delta '%s'...")" "$deltafile" msg "$(gettext "Searching for delta '%s'...")" "$deltafile"
if db_remove_delta "$deltafile"; then if db_remove_delta "$deltafile"; then
@ -405,8 +405,8 @@ clean_up() {
local exit_code=$? local exit_code=$?
cd "$startdir" cd "$startdir"
[ -d "$tmpdir" ] && rm -rf "$tmpdir" [[ -d $tmpdir ]] && rm -rf "$tmpdir"
[ $CLEAN_LOCK -eq 1 -a -f "$LOCKFILE" ] && rm -f "$LOCKFILE" (( CLEAN_LOCK )) && [[ -f $LOCKFILE ]] && rm -f "$LOCKFILE"
exit $exit_code exit $exit_code
} }
@ -414,7 +414,7 @@ clean_up() {
# PROGRAM START # PROGRAM START
# determine whether we have gettext; make it a no-op if we do not # determine whether we have gettext; make it a no-op if we do not
if [ ! $(type -t gettext) ]; then if ! type gettext &>/dev/null; then
gettext() { gettext() {
echo "$@" echo "$@"
} }
@ -427,7 +427,7 @@ esac
# figure out what program we are # figure out what program we are
cmd="$(basename $0)" cmd="$(basename $0)"
if [ "$cmd" != "repo-add" -a "$cmd" != "repo-remove" ]; then if [[ $cmd != "repo-add" && $cmd != "repo-remove" ]]; then
error "$(gettext "Invalid command name '%s' specified.")" "$cmd" error "$(gettext "Invalid command name '%s' specified.")" "$cmd"
exit 1 exit 1
fi fi
@ -447,7 +447,7 @@ for arg in "$@"; do
case "$arg" in case "$arg" in
-q|--quiet) QUIET=1;; -q|--quiet) QUIET=1;;
*) *)
if [ -z "$REPO_DB_FILE" ]; then if [[ -z $REPO_DB_FILE ]]; then
REPO_DB_FILE="$arg" REPO_DB_FILE="$arg"
LOCKFILE="$REPO_DB_FILE.lck" LOCKFILE="$REPO_DB_FILE.lck"
check_repo_db check_repo_db
@ -462,7 +462,7 @@ for arg in "$@"; do
done done
# if at least one operation was a success, re-zip database # if at least one operation was a success, re-zip database
if [ $success -eq 1 ]; then if (( success )); then
msg "$(gettext "Creating updated database file '%s'")" "$REPO_DB_FILE" msg "$(gettext "Creating updated database file '%s'")" "$REPO_DB_FILE"
case "$REPO_DB_FILE" in case "$REPO_DB_FILE" in
@ -476,7 +476,7 @@ if [ $success -eq 1 ]; then
filename=$(basename "$REPO_DB_FILE") filename=$(basename "$REPO_DB_FILE")
cd "$tmpdir" cd "$tmpdir"
if [ -n "$(ls)" ]; then if [[ -n $(ls) ]]; then
bsdtar -c${TAR_OPT}f "$filename" * bsdtar -c${TAR_OPT}f "$filename" *
else else
# we have no packages remaining? zip up some emptyness # we have no packages remaining? zip up some emptyness
@ -485,8 +485,8 @@ if [ $success -eq 1 ]; then
fi fi
cd "$startdir" cd "$startdir"
[ -f "$REPO_DB_FILE" ] && mv -f "$REPO_DB_FILE" "${REPO_DB_FILE}.old" [[ -f $REPO_DB_FILE ]] && mv -f "$REPO_DB_FILE" "${REPO_DB_FILE}.old"
[ -f "$tmpdir/$filename" ] && mv "$tmpdir/$filename" "$REPO_DB_FILE" [[ -f $tmpdir/$filename ]] && mv "$tmpdir/$filename" "$REPO_DB_FILE"
else else
msg "$(gettext "No packages modified, nothing to do.")" msg "$(gettext "No packages modified, nothing to do.")"
exit 1 exit 1