CVS: theedge/var/lib/lunar/functions download.lunar,1.21,1.22

[sofar at lunar-linux.org]

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

Modified Files:
	download.lunar 
Log Message:
Fixes for the SVN urls, symplifying svn and cvs ups.


Index: download.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/download.lunar,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- download.lunar	20 Jul 2003 15:34:36 -0000	1.21
+++ download.lunar	20 Jul 2003 16:52:46 -0000	1.22
@@ -50,9 +50,9 @@
 
   if [[ -f $SOURCE_CACHE/$2 ]]; then
     verbose_msg "Extracting local SVN copy"
-    # unpacking in last component dir of $CVSMODULE
+    # unpacking in last component dir of $SVN_DIR
     CD=$(pwd)
-    if ! unpack $2 ; then
+    if ! tar xjf $SOURCE_CACHE/$2 ; then
       message "${PROBLEM_COLOR}Warning: bad local SVN copy, checking out fresh SVN copy${DEFAULT_COLOR}"
       
       rm_source_dir /tmp/$MODULE-$VERSION
@@ -69,8 +69,10 @@
 
   for (( TRY=1 ; $TRY<$NUM_RETRY+1 ; TRY++ )) ; do
     if [[ -d ${SVN_DIR}/.svn ]]; then
-      verbose_msg "[${TRY}] svn up $SVN_URL"
-      svn up $SVN_URL && GOT_SVN="yes" 
+      cd ${SVN_DIR}
+      verbose_msg "[${TRY}] svn up"
+      svn up && GOT_SVN="yes" 
+      cd ${CD}
     elif ! [[ -d ${SVN_DIR}/.svn ]]; then
       verbose_msg "[${TRY}] svn co $SVN_URL $SVN_DIR"
       svn co $SVN_URL $SVN_DIR && GOT_SVN="yes"
@@ -133,7 +135,7 @@
     CD=$(pwd)
     mkdir -p $(dirname $CVSMODULE)
     cd $(dirname $CVSMODULE)
-    if ! unpack $2 ; then
+    if ! tar xjf $SOURCE_CACHE/$2 ; then
       message "${PROBLEM_COLOR}Warning: bad local CVS copy, checking out fresh CVS copy${DEFAULT_COLOR}"
       
       rm_source_dir /tmp/$MODULE-$VERSION
@@ -153,8 +155,8 @@
 
   for (( TRY=1 ; $TRY<$NUM_RETRY+1 ; TRY++ )) ; do
     if [[ -d $CVSMODULE/CVS ]]; then
-      verbose_msg "[${TRY}] cvs -qz3 up -PAd $CVSOPTIONS $CVSRELEASE $CVSMODULE"
-      cvs -qz3 up -PAd $CVSOPTIONS $CVSRELEASE $CVSMODULE && GOT_CVS="yes" 
+      verbose_msg "[${TRY}] cvs -qz3 up -PAd $CVSOPTIONS $CVSRELEASE"
+      cvs -qz3 up -PAd $CVSOPTIONS $CVSRELEASE && GOT_CVS="yes" 
     elif ! [[ -d CVS ]]; then
       verbose_msg "[${TRY}] cvs -qz3 co $CVSOPTIONS $CVSRELEASE $CVSMODULE"
       cvs -qz3 co $CVSOPTIONS $CVSRELEASE $CVSMODULE && GOT_CVS="yes"