now for all the peanuts

3 files changed, 8 insertions, 5 deletions

diff --git a/extract-distro.sh b/extract-distro.sh
index 348e7f9..8312fe3 100755
--- a/extract-distro.sh
+++ b/extract-distro.sh
@@ -8,11 +8,11 @@ here=`pwd`
 
 df -h .
 
-find "$@" -name debug -o -name Debuginfo | (
+find "$@" \( -name debug -o -name Debuginfo \) -print -prune | (
   echo 'all: \'
-  sed 's,^.*$,do/& \\,'
+  sed 's,^.*$,do/@& \\,'
   echo
-  echo 'do/%:;(cd $* && ls | extract-rpm.sh "$$here") | pack-debuginfo.sh'
+  echo 'do/@%:;(cd $* && ls | extract-rpm.sh "$$here") | pack-debuginfo.sh'
 ) | make -f - -r here="$here" -s -j$(getconf _NPROCESSORS_ONLN)
 
 df -h .
diff --git a/extract-rpm.sh b/extract-rpm.sh
index 9ed5253..44b1014 100755
--- a/extract-rpm.sh
+++ b/extract-rpm.sh
@@ -19,14 +19,15 @@ while read file; do
 
   archless=${rpm%.*}
   arch=${rpm##*.}
-  d=${arch}/${archless:0:2}/${archless:2:2}/$rpm
+  d=${arch}/${archless:0:2}/${archless:2:2}
 
+  d="$dest/$d"
   if [ -d "$d/$rpm" ] && ! rmdir "$d/$rpm" 2> /dev/null; then
     [ $v -eq 0 ] || echo >&2 "$rpm already there"
     continue
   fi
   mkdir -p "$d/$rpm" || exit
-  rpm2cpio "$rpm" |
+  rpm2cpio "$file" |
   (cd "$d/$rpm"; cpio --quiet --extract --no-abs --make-dir ||
   echo >&2 "FAILED: $rpm")
 
diff --git a/pack-debuginfo.sh b/pack-debuginfo.sh
index 404ec19..21432f2 100755
--- a/pack-debuginfo.sh
+++ b/pack-debuginfo.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+unset MAKEFLAGS MFLAGS
+
 get_size()
 {
   size="$1->$3"