r10295 - packages/tarballs

[Gonéri Le Bouder]

Author: goneri
Date: 2009-09-08 13:27:08 +0000 (Tue, 08 Sep 2009)
New Revision: 10295

Modified:
   packages/tarballs/getsources.sh
Log:
works if called from trunk/tarballs


Modified: packages/tarballs/getsources.sh
===================================================================
--- packages/tarballs/getsources.sh	2009-09-08 13:14:56 UTC (rev 10294)
+++ packages/tarballs/getsources.sh	2009-09-08 13:27:08 UTC (rev 10295)
@@ -14,25 +14,20 @@
 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;')
 
-if [ -z $* ]; then
-    TRUNK="../trunk ../../non-free/packages/trunk/"
-else
-    for pkg in $*; do
-        [ -d ../trunk/$pkg ] && TRUNK="$TRUNK ../trunk/$pkg"
-        [ -d ../../non-free/packages/trunk/$pkg ] && TRUNK="$TRUNK ../../non-free/packages/trunk/$pkg"
-    done
-fi
+for pkg in $*; do
+    [ -d ../$pkg ] && TRUNK="$TRUNK ../$pkg"
+    [ -d ../trunk/$pkg ] && TRUNK="../trunk/$pkg"
+    [ -d ../../non-free/packages/trunk/$pkg ] && TRUNK="../../non-free/packages/trunk/$pkg"
+done
+
 SOURCES=$(find $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)"
-  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
+  if [ -f $TRUNK/debian/changelog ]; then
+    changelog=$TRUNK/debian/changelog
   else
     echo "Can't find changelog for $x"
   fi