packages: builder - make "builder --init-rpm-dir" work at least with defaul...

[glen]

Author: glen                         Date: Tue Sep 14 20:41:02 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- make "builder --init-rpm-dir" work at least with defaults (init to ~/rpm/packages)

---- Files affected:
packages:
   builder (1.632 -> 1.633) 

---- Diffs:

================================================================
Index: packages/builder
diff -u packages/builder:1.632 packages/builder:1.633
--- packages/builder:1.632	Mon Sep  6 17:22:30 2010
+++ packages/builder	Tue Sep 14 22:40:57 2010
@@ -2009,13 +2009,23 @@
 }
 
 init_rpm_dir() {
-	TOP_DIR=$(eval $RPM $RPMOPTS --eval '%{_topdir}')
-	CVSROOT=":pserver:cvs@$CVS_SERVER:/cvsroot"
+	local CVSROOT=":pserver:cvs@$CVS_SERVER:/cvsroot"
+	local TOP_DIR=$(eval $RPM $RPMOPTS --eval '%{_topdir}')
+	local rpmdir=$(eval $RPM $RPMOPTS --eval '%{_rpmdir}')
+	local buildir=$(eval $RPM $RPMOPTS --eval '%{_builddir}')
+	local srpmdir=$(eval $RPM $RPMOPTS --eval '%{_srcrpmdir}')
+	local tmp
 
 	echo "Initializing rpm directories to $TOP_DIR from $CVSROOT"
-	mkdir -p $TOP_DIR/{RPMS,BUILD,SRPMS}
-	cd $TOP_DIR
+	mkdir -p $TOP_DIR $rpmdir $buildir $srpmdir
+
+	# need to checkout to tmp dir or we can't name our topdir
+	tmp=$(TMPDIR= TEMPDIR= mktemp -p $TOP_DIR -d) || exit 1
+	cd $tmp
 	$CVS_COMMAND -d $CVSROOT co packages/{.cvsignore,rpm.groups,dropin,mirrors,md5,adapter{,.awk},fetchsrc_request,builder,{relup,compile,repackage}.sh}
+	cd -
+	mv $tmp/packages/* $TOP_DIR
+	rm -rf $tmp
 
 	init_builder
 
@@ -2023,11 +2033,11 @@
 	echo "- run cvs co SPECS"
 
 	echo "To checkout *all* packages:"
-	echo "- run cvs up -dP in $TOP_DIR/packages dir"
+	echo "- run cvs up -dP in $TOP_DIR dir"
 
 	echo ""
 	echo "To commit with your developer account:"
-	echo "- edit $TOP_DIR/packages/CVS/Root"
+	echo "- edit $TOP_DIR/CVS/Root"
 }
 
 get_greed_sources() {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/builder?r1=1.632&r2=1.633&f=u