Ongoing mangling

1 files changed, 3 insertions, 10 deletions

diff --git a/script.sh b/script.sh
index 12c2032..e5a4e35 100755
--- a/script.sh
+++ b/script.sh
@@ -3,20 +3,13 @@
 proc_count=$(grep -c MHz /proc/cpuinfo)
 [ $proc_count -eq 0 ] && proc_count=1
 
-rm -rf git
-mkdir git
+rm -rf git/* git/.git final/*
+mkdir git -p
 # Prioritize the larger categories first; they typically will have
 # the most revs, thus start them first.
 time { \
   find cvs-repo/gentoo-x86 -maxdepth 1 -mindepth 1 -printf '%P\n' | \
   xargs -n1 -I{} --  du -cs "cvs-repo/gentoo-x86/{}" | grep -v 'total$' | \
   sort -gr | awk '{print $2;}' | xargs -n1 basename | \
-  xargs -n1 -P${proc_count} ./process_directory.sh | \
-  {
-    cd git;
-    git init &> /dev/null
-    while read l; do
-      git fetch "$(readlink -f "../final/$l/git")" && git merge FETCH_HEAD -m "blah" -q
-    done
-  }
+  xargs -n1 -P${proc_count} ./process_directory.sh
 }