CVS: theedge/var/lib/lunar/functions download.lunar,1.25,1.26

[sofar at lunar-linux.org]

Update of /var/cvs/lunar/theedge/var/lib/lunar/functions
In directory dbguin.lunar-linux.org:/tmp/cvs-serv15748/var/lib/lunar/functions

Modified Files:
	download.lunar 
Log Message:
one more try....


Index: download.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/download.lunar,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- download.lunar	24 Jul 2003 21:40:34 -0000	1.25
+++ download.lunar	24 Jul 2003 22:04:02 -0000	1.26
@@ -105,7 +105,6 @@
   fi
 
   [ -f ~/.cvspass ] || touch ~/.cvspass
-
   CVSURL=$(echo $1 | sed "s:^cvs\://::")
   CVSARGS=$(echo $CVSURL | cut -d@ -f1)
   CVSSERVER=$(echo $CVSURL | cut -d@ -f2 | cut -d: -f1)
@@ -114,7 +113,6 @@
   CVSRELEASE=$(echo $CVSURL | cut -d@ -f2 | cut -d: -f4)
   CVSOPTIONS=$(echo $CVSURL | cut -d@ -f2 | cut -d: -f5)
 
-
   if [ ! -z $CVSRELEASE ]; then
     CVSRELEASE="-r $CVSRELEASE"
   fi
@@ -127,8 +125,8 @@
 
   mk_source_dir /tmp/$MODULE-$VERSION
   cd /tmp/$MODULE-$VERSION
-
-  if [[ -f $SOURCE_CACHE/$2 ]]; then
+  
+  if [ -f $SOURCE_CACHE/$2 ] ; then
     verbose_msg "Extracting local CVS copy"
     # unpacking in last component dir of $CVSMODULE
     CD=$(pwd -P)
@@ -139,8 +137,10 @@
       
       rm_source_dir /tmp/$MODULE-$VERSION
       mk_source_dir /tmp/$MODULE-$VERSION
+      cd /tmp/$MODULE-$VERSION
+    else
+      cd /tmp/$MODULE-$VERSION/$CVSMODULE
     fi
-    cd $CD
   fi
 
   verbose_msg "CVSROOT=\"$CVSROOT\""
@@ -151,7 +151,7 @@
   fi
 
   for (( TRY=1 ; $TRY<$NUM_RETRY+1 ; TRY++ )) ; do
-    if [ -d $(basename $CVSMODULE)/CVS ] ; then
+    if [ -d CVS ] ; then
       verbose_msg "[${TRY}] cvs -qz3 up -PAd $CVSOPTIONS $CVSRELEASE"
       cvs -qz3 up -PAd $CVSOPTIONS $CVSRELEASE && GOT_CVS="yes" 
     else 
@@ -169,7 +169,7 @@
   if [ "$GOT_CVS" == "yes" ] ; then
     message "${MESSAGE_COLOR}Creating ${FILE_COLOR}${2}${DEFAULT_COLOR}"
     # pack in last component dir of $CVSMODULE
-    cd $(dirname $CVSMODULE)
+    cd /tmp/$MODULE-$VERSION/$(dirname $CVSMODULE)
     tar cjf $SOURCE_CACHE/$2 $(basename $CVSMODULE)
     cd $CD
   else