admin (AC-branch): ftp/geniso-SRPMS - fixed sed - show some progress

hawk hawk at pld-linux.org
Wed Mar 22 18:48:26 CET 2006


Author: hawk                         Date: Wed Mar 22 17:48:26 2006 GMT
Module: admin                         Tag: AC-branch
---- Log message:
- fixed sed
- show some progress

---- Files affected:
admin/ftp:
   geniso-SRPMS (1.1.2.3 -> 1.1.2.4) 

---- Diffs:

================================================================
Index: admin/ftp/geniso-SRPMS
diff -u admin/ftp/geniso-SRPMS:1.1.2.3 admin/ftp/geniso-SRPMS:1.1.2.4
--- admin/ftp/geniso-SRPMS:1.1.2.3	Wed Mar 22 18:38:16 2006
+++ admin/ftp/geniso-SRPMS	Wed Mar 22 18:48:20 2006
@@ -31,6 +31,7 @@
 		fsize=`expr $s + \( \( $s + 2047 \) % 2048 \)`
 		size=`expr $size + $fsize`
 		if [ "$size" -ge "$iso_size" ] ; then
+			echo -n " CD${fileno}"
 			size=0
 			fileno=`expr $fileno + 1`
 			listd=${ISOTMPDIR}/cd${fileno}.links
@@ -42,9 +43,10 @@
 
 rm -fr ${ISOTMPDIR}/cd*.links
 cd $SRPMS
+echo -n "Creating temporary symlinks..."
 calc_size ./
 for i in ${ISOTMPDIR}/cd*.links ; do
-	num=`echo $i | sed 's/\/tmp\/cd\([0-9]\+\)\.links/\1/'`
+	num=`echo $i | sed 's/\/.*\/cd\([0-9]\+\)\.links/\1/'`
 
 	ISONAME="pld-${VERSION}-${SUBVER}-CD${num}.SRPMS"
 	${MKISOFS} -o ${ISOTARGET}/iso/${VERSION}/SRPMS/${ISONAME}.iso \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/admin/ftp/geniso-SRPMS?r1=1.1.2.3&r2=1.1.2.4&f=u



More information about the pld-cvs-commit mailing list