admin: cvs/cvsconv.sh - readability

baggins baggins at pld-linux.org
Tue May 15 13:21:45 CEST 2007


Author: baggins                      Date: Tue May 15 11:21:43 2007 GMT
Module: admin                         Tag: HEAD
---- Log message:
- readability

---- Files affected:
admin/cvs:
   cvsconv.sh (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: admin/cvs/cvsconv.sh
diff -u admin/cvs/cvsconv.sh:1.2 admin/cvs/cvsconv.sh:1.3
--- admin/cvs/cvsconv.sh:1.2	Tue May 15 13:12:03 2007
+++ admin/cvs/cvsconv.sh	Tue May 15 13:21:38 2007
@@ -1,8 +1,11 @@
 #!/bin/ksh
 
 PATH="/bin:/usr/bin:/usr/sbin:/sbin:/usr/X11R6/bin"
-CVSROOT=/cvsroot
 TEMPFILE=$(mktemp /tmp/repoconv.XXXXXX)
+CVSROOT=/cvsroot
+SOURCE_DIR=$CVSROOT/SOURCES
+SPEC_DIR=$CVSROOT/SPECS
+PKGS_DIR=$CVSROOT/packages
 
 DEREF="-L"
 
@@ -54,6 +57,9 @@
 %_sourcedir ./
 EOF
 
+__PWD=$(pwd)
+cd $SPEC_DIR
+
 for f in `find -name \*.spec,v -printf "%P\n"`; do
 	:>$TEMPFILE
 	SPECFILE=${f%%,v}
@@ -82,16 +88,16 @@
 	echo
 	sources="`awk '$2 ~ /^(SOURCE|PATCH)URL[0-9]+/ {gsub(/.*\//,"", $3); print $3}' $TEMPFILE | sort -u`"
 
-	mkdir -p $CVSROOT/packages/$PACKAGE/Attic
+	mkdir -p $PKGS_DIR/$PACKAGE/Attic
 	for s in $sources $ICONS; do
-		if [ -e "$CVSROOT/SOURCES/$s,v" ] ; then
-			ln -sf $CVSROOT/SOURCES/$s,v $CVSROOT/packages/$PACKAGE/$s,v
-		elif [ -e "$CVSROOT/SOURCES/Attic/$s,v" ] ; then
-			ln -sf $CVSROOT/SOURCES/Attic/$s,v $CVSROOT/packages/$PACKAGE/Attic/$s,v
+		if [ -e "$SOURCE_DIR/$s,v" ] ; then
+			ln -sf $SOURCE_DIR/$s,v $PKGS_DIR/$PACKAGE/$s,v
+		elif [ -e "$SOURCE_DIR/Attic/$s,v" ] ; then
+			ln -sf $SOURCE_DIR/Attic/$s,v $PKGS_DIR/$PACKAGE/Attic/$s,v
 		fi
 	done
 
-	ln -s $CVSROOT/SPECS/$f $CVSROOT/packages/$PACKAGE/$f
+	ln -s $SPEC_DIR/$f $PKGS_DIR/$PACKAGE/$f
 	rm -f $SPECFILE
 done
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/admin/cvs/cvsconv.sh?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list