summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorXavier Chantry <shiningxc@gmail.com>2009-02-18 17:15:39 +0100
committerDan McGee <dan@archlinux.org>2009-02-19 19:20:27 -0600
commitc8a41b7d6da7f820754a07cb085687ea5e110f85 (patch)
tree523b3cd5e61683fc95829acd0f54149bedd90612 /scripts
parentc590ac0997b5c82ddf9115191e9ac5c79efde227 (diff)
downloadpacman-c8a41b7d6da7f820754a07cb085687ea5e110f85.tar.xz
repo-add : remove realpath usage
Rework slightly db_write_entry so that $pkgfile is no longer referenced from the temporary dir. This means $pkgfile can be a relative path and does not need to be converted with realpath anymore. Signed-off-by: Xavier Chantry <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/repo-add.sh.in43
1 files changed, 19 insertions, 24 deletions
diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in
index 7638f455..c6d25aac 100644
--- a/scripts/repo-add.sh.in
+++ b/scripts/repo-add.sh.in
@@ -97,8 +97,8 @@ write_list_entry() {
# arg1 - path to delta
db_write_delta()
{
- # blank out all variables and set deltafile to absolute path
- local deltafile=$($realpath "$1")
+ # blank out all variables
+ local deltafile="$1"
local filename=$(basename "$deltafile")
local deltavars pkgname fromver tover arch csize md5sum
@@ -128,12 +128,12 @@ db_write_delta()
# arg1 - path to package
db_write_entry()
{
- # blank out all variables and set pkgfile to an absolute path
- local pkgfile=$($realpath "$1")
+ # blank out all variables
+ local pkgfile="$1"
local pkgname pkgver pkgdesc url builddate packager csize size \
group depend backup license replaces provides conflict force \
_groups _depends _backups _licenses _replaces _provides _conflicts \
- startdir optdepend _optdepends
+ startdir optdepend _optdepends md5sum
local OLDIFS="$IFS"
# IFS (field separator) is only the newline character
@@ -162,22 +162,22 @@ db_write_entry()
IFS=$OLDIFS
- # get compressed size of package
+ # get md5sum and compressed size of package
+ md5sum="$(openssl dgst -md5 "$pkgfile" | awk '{print $NF}')"
csize=$(@SIZECMD@ "$pkgfile")
- startdir=$(pwd)
- pushd "$gstmpdir" 2>&1 >/dev/null
-
# ensure $pkgname and $pkgver variables were found
if [ -z "$pkgname" -o -z "$pkgver" ]; then
error "$(gettext "Invalid package file '%s'.")" "$pkgfile"
- popd 2>&1 >/dev/null
return 1
fi
# remove an existing entry if it exists, ignore failures
db_remove_entry "$pkgname"
+ startdir=$(pwd)
+ pushd "$gstmpdir" 2>&1 >/dev/null
+
# create package directory
mkdir "$pkgname-$pkgver"
cd "$pkgname-$pkgver"
@@ -194,7 +194,7 @@ db_write_entry()
# compute checksums
msg2 "$(gettext "Computing md5 checksums...")"
- echo -e "%MD5SUM%\n$(openssl dgst -md5 "$pkgfile" | awk '{print $NF}')\n" >>desc
+ echo -e "%MD5SUM%\n$md5sum\n" >>desc
[ -n "$url" ] && echo -e "%URL%\n$url\n" >>desc
write_list_entry "LICENSE" "$_licenses" "desc"
@@ -212,6 +212,7 @@ db_write_entry()
write_list_entry "OPTDEPENDS" "$_optdepends" "depends"
# create deltas entry if there are delta files
+ # Xav : why should deltas be in $startdir?
for delta in $startdir/$pkgname-*-*_to_*-*-$arch.delta; do
# This for loop also pulls in all files that start with the current package
# name and are followed by a -whatever. For instance, running this loop for
@@ -237,11 +238,15 @@ db_write_entry()
# add the final newline
[ -f "deltas" ] && echo -e "" >>deltas
+ popd 2>&1 >/dev/null
+
# preserve the modification time
- touch -r "$pkgfile" desc depends
- [ -f "deltas" ] && touch -r "$pkgfile" deltas
+ # Xav : what for?
+ pkgdir="$gstmpdir/$pkgname-$pkgver"
+ touch -r "$pkgfile" "$pkgdir/desc" "$pkgdir/depends"
+ [ -f "$pkgdir/deltas" ] && touch -r "$pkgfile" "$pkgdir/deltas"
- popd 2>&1 >/dev/null
+ return 0
} # end db_write_entry
# remove existing entries from the DB
@@ -288,16 +293,6 @@ if [ $# -lt 2 ]; then
exit 1
fi
-# check for and store the name of a realpath-like program
-if [ $(type -t realpath) ]; then
- realpath='realpath'
-elif [ $(type -t readlink) ]; then
- realpath='readlink -f'
-else
- error "$(gettext "Either realpath or readlink are required by repo-add.")"
- exit 1 # $E_MISSING_PROGRAM
-fi
-
# main routine
gstmpdir=$(mktemp -d /tmp/repo-tools.XXXXXXXXXX) || (\
error "$(gettext "Cannot create temp directory for database building.")"; \