From 4ffc53b3398ae845183f991a56207459256cc9e9 Mon Sep 17 00:00:00 2001
From: Judd Vinet <judd@archlinux.org>
Date: Sat, 18 Sep 2004 18:37:34 +0000
Subject: Imported from pacman-2.9.tar.gz

---
 scripts/gensync    | 48 +++++++++++++++++++++++-------------------------
 scripts/makepkg    | 18 +++++++++---------
 scripts/makeworld  |  2 +-
 scripts/updatesync | 20 +++++++++++++++-----
 4 files changed, 48 insertions(+), 40 deletions(-)

(limited to 'scripts')

diff --git a/scripts/gensync b/scripts/gensync
index bdadc30b..8dbe8921 100755
--- a/scripts/gensync
+++ b/scripts/gensync
@@ -20,7 +20,7 @@
 #   USA.
 #
 
-myver='2.8.4'
+myver='2.9'
 
 usage() {
   echo "gensync $myver"
@@ -45,9 +45,14 @@ usage() {
   exit 0
 }
 
+die() {
+	echo "gensync: $*" >&2
+	rm -rf $gstmpdir
+	exit 1
+}
+
 get_md5checksum()
 {
-	source $1 || return 1
 	if [ "$pkgdir" != "" ]; then
 		pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel.pkg.tar.gz"
 	else
@@ -80,6 +85,9 @@ db_write_entry()
 	echo "%DESC%" >>desc
 	echo "$pkgdesc" >>desc
 	echo "" >>desc
+	echo "%CSIZE%" >>desc
+	echo "$csize" >>desc
+	echo "" >>desc
 	if [ ! -z $pkgmd5sum ]; then
 		echo "%MD5SUM%" >>desc
 		echo "$pkgmd5sum" >>desc
@@ -147,40 +155,30 @@ pkgdir=
 if [ "$3" != "" ]; then
 	pkgdir=$3
 fi
-gstmpdir=$(mktemp -dt gensync.XXXXXXXXXX) || exit 1
-
-if [ ! -d $rootdir ]; then
-	echo "gensync: invalid root dir: $rootdir" >&2
-	rm -rf $gstmpdir
-	exit 1
-fi
+gstmpdir=$(mktemp -d /tmp/gensync.XXXXXXXXXX) || exit 1
 
+[ ! -d $rootdir ] && die "invalid root dir: $rootdir"
 echo "gensync: building database entries, generating md5sums..." >&2
 cd `dirname $2`
 for file in `find $rootdir/* -name PKGBUILD`; do
-	pkgmd5sum=`get_md5checksum $file $pkgdir`
-	if [ -z $pkgmd5sum ]; then
-		echo "gensync: error generating checksum for $file" >&2
-		rm -rf $gstmpdir
-		exit 1
+	source $file || die "errors parsing $file"
+	if [ "$pkgdir" != "" ]; then
+		pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel.pkg.tar.gz"
+	else
+		pkgfile="$destdir/$pkgname-$pkgver-$pkgrel.pkg.tar.gz"
 	fi
+	[ -f $pkgfile ] || die "missing package file: $pkgfile"
+	csize=`du -b $pkgfile | cut -f1`
+	pkgmd5sum=`get_md5checksum $pkgfile`
+	[ -z $pkgmd5sum ] && die "error generating checksum for $pkgfile"
 	db_write_entry $file
-	if [ $? -gt 0 ]; then
-		echo "gensync: error writing entry for $file" >&2
-		rm -rf $gstmpdir
-		exit 1
-	fi
+	[ $? -gt 0 ] && die "error writing entry for $file"
 done
 
 echo "gensync: compressing to $destfile..." >&2
 cd $gstmpdir
 tar c * | gzip -9 >$destfile
-if [ $? -gt 0 ]; then
-	echo "gensync: error writing to $destfile" >&2
-	rm -rf $gstmpdir
-	exit 1
-fi
+[ $? -gt 0 ] && die "error writing to $destfile"
 
 rm -rf $gstmpdir
-
 exit 0
diff --git a/scripts/makepkg b/scripts/makepkg
index 8f4103e5..98e2acc3 100755
--- a/scripts/makepkg
+++ b/scripts/makepkg
@@ -20,7 +20,7 @@
 #   USA.
 #
 
-myver='2.8.4'
+myver='2.9'
 startdir=`pwd`
 PKGDEST=$startdir
 USE_COLOR="n"
@@ -576,17 +576,17 @@ fi
 
 # compress man pages
 msg "Compressing man pages..."
-for i in `find pkg/{usr{,/local},opt/*}/man -type f 2>/dev/null`; do
-	ext=${i##*.}
-	fn=${i##*/}
-	if [ "$ext" != "gz" ]; then
+find $startdir/pkg/{usr{,/local,/share},opt/*}/man -type f 2>/dev/null | while read i ; do
+	ext="${i##*.}"
+	fn="${i##*/}"
+	if [ "$ext" != "gz" -a "$ext" != "bz2" ]; then
 		# update symlinks to this manpage
-		for ln in `find pkg/{usr{,/local},opt/*}/man -lname "$fn" 2>/dev/null`; do
-			rm -f $ln
-			ln -sf ${fn}.gz ${ln}.gz
+		find $startdir/pkg/{usr{,/local,/share},opt/*}/man -lname "$fn" 2> /dev/null | while read ln ; do
+			rm -f "$ln"
+			ln -sf "${fn}.gz" "${ln}.gz"
 		done
 		# compress the original
-		gzip -9 $i
+		gzip -9 "$i"
 	fi
 done
 
diff --git a/scripts/makeworld b/scripts/makeworld
index 249ae813..5346a0d5 100755
--- a/scripts/makeworld
+++ b/scripts/makeworld
@@ -21,7 +21,7 @@
 #
 
 toplevel=`pwd`
-version="2.8.4"
+version="2.9"
 
 usage() {
 	echo "makeworld version $version"
diff --git a/scripts/updatesync b/scripts/updatesync
index bc17addf..50dc26f0 100755
--- a/scripts/updatesync
+++ b/scripts/updatesync
@@ -21,7 +21,7 @@
 #   USA.
 #
 
-myver='2.8.4'
+myver='2.9'
 
 usage() {
 	echo "updatesync $myver"
@@ -56,7 +56,6 @@ die()
 
 get_md5checksum()
 {
-	source $1 || return 1
 	if [ "$pkgdir" != "" ]; then
 		pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel.pkg.tar.gz"
 	else
@@ -89,6 +88,9 @@ db_write_entry()
 	echo "%DESC%" >>desc
 	echo "$pkgdesc" >>desc
 	echo "" >>desc
+	echo "%CSIZE%" >>desc
+	echo "$csize" >>desc
+	echo "" >>desc
 	if [ ! -z $pkgmd5sum ]; then
 		echo "%MD5SUM%" >>desc
 		echo "$pkgmd5sum" >>desc
@@ -177,7 +179,7 @@ if [ "$action" != "upd" -a "$action" != "del" ]; then
 	exit 1
 fi
 
-ustmpdir=$(mktemp -dt updatesync.XXXXXXXXXX) || exit 1
+ustmpdir=$(mktemp -d /tmp/updatesync.XXXXXXXXXX) || exit 1
 
 cd $ustmpdir
 if [ ! -f $pkgdb ]; then
@@ -202,8 +204,16 @@ if [ "$action" = "upd" ]; then
 	# INSERT / UPDATE
 	delete_entry $option
 
-	pkgmd5sum=`get_md5checksum $option`
-	[ -z $pkgmd5sum ] && die "error generating checksum for $option"
+	source $option || die "errors parsing $option"
+	if [ "$pkgdir" != "" ]; then
+		pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel.pkg.tar.gz"
+	else
+		pkgfile="$destdir/$pkgname-$pkgver-$pkgrel.pkg.tar.gz"
+	fi
+	[ -f $pkgfile ] || die "missing package file: $pkgfile"
+	csize=`du -b $pkgfile | cut -f1`
+	pkgmd5sum=`get_md5checksum $pkgfile`
+	[ -z $pkgmd5sum ] && die "error generating checksum for $pkgfile"
 	echo "updatesync: creating entry for $option" >&2
 	db_write_entry $option || die "error writing entry for $option"
 else
-- 
cgit v1.2.3-24-g4f1b