moin2iki: updating

1 files changed, 3 insertions, 2 deletions

diff --git a/moin2iki.mdwn b/moin2iki.mdwn
index 2004d32..98b9a7f 100644
--- a/moin2iki.mdwn
+++ b/moin2iki.mdwn
@@ -7,11 +7,12 @@
     cd /srv/${PROJECT}.freedesktop.org/moin
     /usr/src/moin2iki/moin2git | ( cd ~/${PROJECT}/ && git fast-import ) # or -p PageName to grab one page at a time, which is probably wiser for spam-ridden Moins.
     # Sometimes pages get missed; you can manually moint2git -p PageName them afterwards and then merge the resulting objects in.
+    ( cd ~/${PROJECT}/ && git checkout )
     /usr/src/moin2iki/moin2mdwn -r ~/${PROJECT} # or -p PageName again
     # May also need to mkdir data/pages-bad; mv data/pages/FindPage data/pages-bad/ and try again because moin2mdwn hates that particular one and possibly others
     cd ~/${PROJECT}
-    git add *.mdwn
-    for file in *; do name=$(basename $file .moin); test -f $name.mdwn && git rm $name.moin; done
+    git add *
+    for file in $(find * -iname '*.moin'); do name=$(echo $file | perl -pe 's/(.+)\.moin/\1/'); test -f $name.mdwn && git rm $name.moin; done
     git commit -m 'moin2iki: Mass conversion with moin2mdwn tool' .
     git mv FrontPage.mdwn index.mdwn
     git commit -m 'moin2iki: Moving FrontPage.mdwn to index.mdwn'