2 files changed, 9 insertions, 12 deletions

diff --git a/SuckItFos b/SuckItFos
index 1e6e48d..0f6f8a8 100755
--- a/SuckItFos
+++ b/SuckItFos
@@ -22,6 +22,7 @@ do
     mkdir -p combined/$base
     mkdir -p combined/${base}/`dirname ${file}`
     echo "Converting ${URL}/${base}/${file}?cover=print -> Foswiki/${base}/${file}.md"
+    echo -e "ogWiki=Foswiki\nogURL=${URL}/${base}/${file}\n" > Foswiki/${base}/${file}.md.md 
     # Doesn't help with redownloads, coz natch a dynamic site isn't cached.  But I can at least comment out the curl command during testing to save time.
     curl --silent --no-progress-meter ${URL}/${base}/${file}?cover=print -o Foswiki/${base}/${file}.HTM
     cp Foswiki/${base}/${file}.HTM Foswiki/${base}/${file}.HTM_ORIGINAL
@@ -47,6 +48,9 @@ do
         rm Foswiki/${base}/${file}.md
         mv xx00 Foswiki/${base}/${file}.md
     fi
+    if [ -f xx01 ]; then
+        rm xx01
+    fi
 
     # Attempt to clean things up, badly.
     sed -i -E Foswiki/${base}/${file}.md \
@@ -57,12 +61,7 @@ do
 #       -e 's/\{\.pattern.*\}//g' \
 #       -e 's/\{\.pattern.*//g' \
 
-    echo -e "****\n[Original page](${URL}/${base}/${file}) where maybe you can edit it." >> Foswiki/${base}/${file}.md
     ln -frs Foswiki/${base}/${file}.md combined/${base}/${file}.md
-
-    if [ -f xx01 ]; then
-        rm xx01
-    fi
 done
 
 popd
diff --git a/SuckItPm b/SuckItPm
index fe7efb3..fd0b048 100755
--- a/SuckItPm
+++ b/SuckItPm
@@ -20,6 +20,7 @@ do
     mkdir -p PmWiki/$base
     mkdir -p combined/$base
     echo "Converting ${URL}/?n=${base}.${file}?action=print -> PmWiki/${base}/${file}.md"
+    echo -e "ogWiki=PmWiki\nogURL=${URL}/?n=${base}.${file}\n" > PmWiki/${base}/${file}.md.md
     # Doesn't help with redownloads, coz natch a dynamic site isn't cached.  But I can at least comment out the curl command during testing to save time.
 #    curl --no-progress-meter ${URL}/?n=${base}.${file}?action=markdown -o PmWiki/${base}/${file}.MD
     curl --no-progress-meter ${URL}/?n=${base}.${file}?action=print -o PmWiki/${base}/${file}.HTM
@@ -29,6 +30,9 @@ do
         rm PmWiki/${base}/${file}.HTM
         mv xx00 PmWiki/${base}/${file}.HTM
     fi
+    if [ -f xx01 ]; then
+        rm xx01
+    fi
     sed -i -E PmWiki/${base}/${file}.HTM \
         -e "s/rel='nofollow'//g" \
         -e "s/target='_blank'//g" \
@@ -53,7 +57,6 @@ do
         -e 's/\{#.*\}//g' \
         -e '/^:::/d' \
 #       -e '/\[Site$/d' \
-#       -e '/^Page last modified on /d' \
 #       -e '/^\[\]/d' \
 #       -e "s/\`<a id='trailstart'>\`\{=html\}\`<\/a>\`\{=html\}//g" \
 #       -e "s/^\`<img /<img /g" \
@@ -61,13 +64,8 @@ do
 #       -e "s/^\`\`\`//g" \
 #       -e "s/\`\{=html\}//g"
 
-    # Don't need this, the parts we are grabbing already include that link at the bottom.
-#    echo -e "****\n[Original page](${URL}/${base}/${page}) where maybe you can edit it." >> PmWiki/${base}/${file}.md
     ln -frs PmWiki/${base}/${file}.md combined/${base}/${file}.md
-
-    if [ -f xx01 ]; then
-        rm xx01
-    fi
+    ln -frs PmWiki/${base}/${file}.md.md combined/${base}/${file}.md.md
 done
 
 popd