r2458 - packages/tarballs

[Gonéri Le Bouder]

Author: goneri-guest
Date: 2007-03-06 12:42:03 +0000 (Tue, 06 Mar 2007)
New Revision: 2458

Modified:
   packages/tarballs/getsources.sh
Log:
hack to retrieve non-free tarball too


Modified: packages/tarballs/getsources.sh
===================================================================
--- packages/tarballs/getsources.sh	2007-03-06 00:39:16 UTC (rev 2457)
+++ packages/tarballs/getsources.sh	2007-03-06 12:42:03 UTC (rev 2458)
@@ -7,14 +7,21 @@
 cd "$(dirname $0)"
 [ -z "$DEBIANMIRROR" ] && DEBIANMIRROR=$(grep -E '^deb\ (ht|f)tp' /etc/apt/sources.list| head -n 1 | sed 's;^deb.*p://\([^/]*\)/debian.*;\1;')
 
-#SOURCES=$(find ../trunk -wholename '*debian/control' -exec sed -ne 's/Source: //p' '{}' ';' | sort | uniq)
-SOURCES=$(find ../trunk -regex '.*debian\/control' -exec sed -ne 's/Source: //p' '{}' ';' | sort | uniq)
+SOURCES=$(find ../trunk ../../non-free/packages/trunk/ -regex '.*debian\/control' -exec sed -ne 's/Source: //p' '{}' ';' | sort | uniq)
 
 for x in ${SOURCES}; do
   echo -n "$x: "
   CACHE="$(apt-cache showsrc $x)"
   DIR="$(echo "$CACHE" | sed -ne 's/Directory: //p' | head -n 1)"
-  SVNRELEASE="$(cat ../trunk/$x/debian/changelog | head -n 1 | sed 's/.*(\(.*\)).*/\1/' | sed 's/-.*//' | sed 's/.*://')"
+  if [ -f ../trunk/$x/debian/changelog ]; then
+    changelog=../trunk/$x/debian/changelog
+  elif [ -f ../../non-free/packages/trunk/$x/debian/changelog ]; then
+    changelog=../../non-free/packages/trunk/$x/debian/changelog
+  else
+    echo "Can't find changelog for $x"
+  fi
+
+  SVNRELEASE="$(cat $changelog | head -n 1 | sed 's/.*(\(.*\)).*/\1/' | sed 's/-.*//' | sed 's/.*://')"
   #TARBALL="$(echo "$CACHE" | sed -ne 's/.* \(.*[.]tar[.]gz\)/\1/p'| head -n 1)"
   if [ "$SVNRELEASE" = "" ]; then
       echo "can't read current release from changelog"