[Lunar-commits] r15532 - lunar/trunk/bin

[Auke Kok]

Author: sofar
Date: 2005-06-30 12:27:18 +0000 (Thu, 30 Jun 2005)
New Revision: 15532

Modified:
   lunar/trunk/bin/lvu
Log:
Properly construct diff to support nested folders too.


Modified: lunar/trunk/bin/lvu
===================================================================
--- lunar/trunk/bin/lvu	2005-06-30 12:15:51 UTC (rev 15531)
+++ lunar/trunk/bin/lvu	2005-06-30 12:27:18 UTC (rev 15532)
@@ -742,15 +742,16 @@
       exit 1
   else
     if echo $SECTION | grep -q '^zlocal' ; then
-	  ZLOCAL_OVERRIDES=off SECTION=$(find_section $1)
-	  if echo $SECTION | grep -q '^zlocal' ; then
+	  ZLOCAL_OVERRIDES=off NZSECTION=$(find_section $1)
+	  if echo $NZSECTION | grep -q '^zlocal' ; then
 	    unset SECTION
 	  fi
 	else
 	  message "no local copy of \"$MODULE\" exists"
 	  exit 1
     fi
-  diff -Nurb $MOONBASE/$SECTION/$MODULE $MOONBASE/zlocal/$MODULE --exclude ".svn" --exclude "CVS" | sed "s|^\([+-][+-][+-] \)$MOONBASE/[^/]*/|\1|g" | grep -v "^diff "
+	ZSECTION=$(echo $SECTION | sed 's/zlocal\///g')
+    diff -Nurb $MOONBASE/$NZSECTION/$MODULE $MOONBASE/zlocal/$ZSECTION/$MODULE --exclude ".svn" --exclude "CVS" | sed "s|^\([+-][+-][+-] \)$MOONBASE/[^/]*/|\1|g" | grep -v "^diff " | sed "s|$ZSECTION\/||g"
   fi
 }