[Lunar-commits] r21532 - moonbase/trunk/devel/cvs/plugin.d

[Auke Kok]

Author: sofar
Date: 2006-09-22 18:29:38 +0000 (Fri, 22 Sep 2006)
New Revision: 21532

Modified:
   moonbase/trunk/devel/cvs/plugin.d/download-cvs.plugin
Log:
Remove unneeded directory switching.


Modified: moonbase/trunk/devel/cvs/plugin.d/download-cvs.plugin
===================================================================
--- moonbase/trunk/devel/cvs/plugin.d/download-cvs.plugin	2006-09-22 18:21:14 UTC (rev 21531)
+++ moonbase/trunk/devel/cvs/plugin.d/download-cvs.plugin	2006-09-22 18:29:38 UTC (rev 21532)
@@ -50,12 +50,8 @@
     verbose_msg "Extracting local CVS copy"
     if ! unpack $2 ; then
       message "${PROBLEM_COLOR}Warning: bad local CVS copy, checking out fresh CVS copy${DEFAULT_COLOR}"
-
       rm_source_dir $TMPDIR/$MODULE-$VERSION
       mk_source_dir $TMPDIR/$MODULE-$VERSION
-      cd $TMPDIR/$MODULE-$VERSION
-    else
-      cd $TMPDIR/$MODULE-$VERSION/$SBASE
     fi
   fi
 
@@ -69,7 +65,9 @@
   for (( TRY=1 ; $TRY<$NUM_RETRY+1 ; TRY++ )) ; do
     if [ -d CVS ] ; then
       verbose_msg "[${TRY}] cvs -qz3 up -PAd $CVSOPTIONS $CVSRELEASE"
-      cvs -qz3 up -PAd $CVSOPTIONS $CVSRELEASE && GOT_CVS="yes" 
+      cd $TMPDIR/$MODULE-$VERSION/$SBASE
+      cvs -qz3 up -PAd $CVSOPTIONS $CVSRELEASE && GOT_CVS="yes"
+      cd $TMPDIR/$MODULE-$VERSION
     else
       verbose_msg "[${TRY}] cvs -d $CVSROOT -qz3 co $CVSOPTIONS $CVSRELEASE $CVSMODULE"
       cvs -d $CVSROOT -qz3 co -d $SBASE $CVSOPTIONS $CVSRELEASE $CVSMODULE && GOT_CVS="yes"
@@ -85,9 +83,7 @@
   if [ "$GOT_CVS" == "yes" ] ; then
     message "${MESSAGE_COLOR}Creating ${FILE_COLOR}$2${DEFAULT_COLOR}"
     # pack in last component dir of $CVSMODULE
-    cd $TMPDIR/$MODULE-$VERSION
     tar cjf $3/$2 $SBASE/
-    cd $CD
   else
     activity_log "lget"  "$MODULE"  "$VERSION"  "failed" "Could not get $CVSMODULE"
   fi