Major YAR!!

Moved the post download code from the SuckIt's to the main script, and
combined what's left.

Minor icon tweak.

Think I have almost figured out the HTML and CSS to get the layout to
behave.

Major rearrange of the main script.

Use more of lunamark and RE.

Moar colours!

Solved the generic colour shenanigans.

Solved a few other bugs.

Hidden directories.

Lots of things I forgot about.

3 files changed, 69 insertions, 140 deletions

diff --git a/SuckIt b/SuckIt
new file mode 100755
index 0000000..57aa88b
--- /dev/null
+++ b/SuckIt
@@ -0,0 +1,69 @@
+#!/bin/bash
+
+TIMEFORMAT="    took %lR using %P%% CPU"
+time {
+pushd /opt/merged
+
+rm -fr Foswiki/*
+cp -r /opt/merged_EMPTY/Foswiki .
+rm -fr PmWiki/*
+cp -r /opt/merged_EMPTY/PmWiki .
+
+
+filter="
+ -name _default -prune -o \
+ -name _empty -prune -o \
+ -name System -prune -o \
+ -name Trash -prune -o \
+ -name TWiki -prune -o \
+"
+URL="https://fos.wiki.devuan.org"
+time find /opt/Foswiki/data  ${filter} \
+-name "*.txt" -type f,l -printf "%P\n" | while read line
+do
+    base=`echo "${line}" | cut -d '/' -f 1`
+    file=`echo "${line}" | cut -d '/' -f 2- | rev | cut -b 5- | rev`
+    if [[ ! $file =~ (AdminGroup|AdminUser|AdminUserLeftBar|EditorGroup|GroupTemplate|GroupViewTemplate|NobodyGroup|PatternSkinUserViewTemplate|ProjectContributor|RegistrationAgent|SitePreferences|UnprocessedRegistrations|UnprocessedRegistrationsLog|UserHomepageHeader|UserList|UserListByDateJoined|UserListByLocation|UserList|UserListHeader|WebAtom|WebChanges|WebCreateNewTopic|WebHome|WebIndex|WebLeftBar|WebLeftBarExample|WebNotify|WebPreferences|WebRss|WebSearch|WebSearchAdvanced|WebTopicList|WikiGroups|WikiUsers)$ ]]; then
+        time=`date --rfc-3339=seconds -ur /opt/Foswiki/data/${base}/${file}.txt | cut -d '+' -f 1`
+        mkdir -p Foswiki/$base
+        mkdir -p Foswiki/${base}/`dirname ${file}`
+        echo -e "ogWiki=Foswiki\nogURL=${URL}\nogBase=${base}\nogFile=${file}\ntimestamp=${time}\n" > Foswiki/${base}/${file}.md.md 
+        echo "downloading ${URL}/${base}/${file}?cover=print"
+        # 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
+    fi
+done
+
+
+filter="
+ -not -name "*~" -a \
+ -not -name ".flock" -a \
+ -not -name ".htaccess" -a \
+ -not -name ".lastmod" -a \
+ -not -name ".pageindex" -a \
+"
+URL="https://wiki.devuan.org"
+time find /opt/pmwiki/wiki.d  ${filter} \
+-name "*.*" -type f,l -printf "%P\n" | while read line
+do
+    base=`echo "${line}" | cut -d '.' -f 1`
+    if [[ "${base}" !=  "Site" ]]; then
+        file=`echo "${line}" | cut -d '.' -f 2`
+        time=`date --rfc-3339=seconds -ur /opt/pmwiki/wiki.d/${base}.${file} | cut -d '+' -f 1`
+        mkdir -p PmWiki/$base
+        echo -e "ogWiki=PmWiki\nogURL=${URL}\nogBase=${base}\nogFile=${file}\ntimestamp=${time}\n" > PmWiki/${base}/${file}.md.md
+#       echo "downloading ${URL}/?n=${base}.${file}?action=markdown"
+#       curl --no-progress-meter ${URL}/?n=${base}.${file}?action=markdown -o PmWiki/${base}/${file}.MARKDOWN
+        echo "downloading ${URL}/?n=${base}.${file}?action=print"
+        curl --no-progress-meter ${URL}/?n=${base}.${file}?action=print -o PmWiki/${base}/${file}.HTM
+
+#       pandoc -f markdown -t commonmark_x --self-contained PmWiki//${base}/${file}.MD >PmWiki/${base}/${file}.md
+#       pandoc -f html -t commonmark_x --self-contained PmWiki//${base}/${file}.HTM >PmWiki/${base}/${file}.md
+    fi
+done
+
+
+time notYetAnotherWiki.lua
+
+popd
+}
diff --git a/SuckItFos b/SuckItFos
deleted file mode 100755
index dc65505..0000000
--- a/SuckItFos
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-URL="https://fos.wiki.devuan.org"
-
-filter="
- -name _default -prune -o \
- -name _empty -prune -o \
- -name System -prune -o \
- -name Trash -prune -o \
- -name TWiki -prune -o \
-"
-
-pushd /opt/mergedWork
-
-find /opt/Foswiki/data  ${filter} \
--name "*.txt" -type f,l -printf "%P\n" | while read line
-do
-    base=`echo "${line}" | cut -d '/' -f 1`
-    file=`echo "${line}" | cut -d '/' -f 2- | rev | cut -b 5- | rev`
-    time=`date --rfc-3339=seconds -ur /opt/Foswiki/data/${base}/${file}.txt | cut -d '+' -f 1`
-    mkdir -p Foswiki/$base
-    mkdir -p Foswiki/${base}/`dirname ${file}`
-    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}\nogBase=${base}\nogFile=${file}\ntimestamp=${time}\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
-    csplit -ks Foswiki/${base}/${file}.HTM '%<div id="patternMainContents">%' '/<div class="foswikiAttachments foswikiFormStep" style="overflow:auto">/'
-    if [ -f xx00 ]; then
-        rm Foswiki/${base}/${file}.HTM
-        mv xx00 Foswiki/${base}/${file}.HTM
-    fi
-    sed -i -E Foswiki/${base}/${file}.HTM \
-        -e "s/rel='nofollow'//g" \
-        -e 's/rel="nofollow"//g' \
-        -e "s/target='_blank'//g" \
-        -e "s/class='foswiki[[:alpha:]]*'//g" \
-        -e 's/class="foswikiTopic"/class="FoswikiTopic"/g' \
-        -e 's/class="foswiki[[:alpha:]]*"//g' \
-        -e "s/style='.*;'//g"
-
-    pandoc -f html -t commonmark_x --self-contained Foswiki//${base}/${file}.HTM >Foswiki/${base}/${file}.md
-    cp Foswiki/${base}/${file}.md Foswiki/${base}/${file}.md_ORIGINAL
-
-    csplit -ks Foswiki/${base}/${file}.md '%::: {.FoswikiTopic}%' '/::: {.patternInfo}/'
-    if [ -f xx00 ]; then
-        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 \
-        -e 's/\$/\$dlr\$/g' \
-        -e 's/\{#.*\}//g' \
-        -e '/^:::/d' \
-        -e '/^<!-- -->/d' \
-#       -e 's/\{\.pattern.*\}//g' \
-#       -e 's/\{\.pattern.*//g' \
-
-    ln -frs Foswiki/${base}/${file}.md combined/${base}/${file}.md
-done
-
-popd
diff --git a/SuckItPm b/SuckItPm
deleted file mode 100755
index 246f485..0000000
--- a/SuckItPm
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/bash
-
-URL="https://wiki.devuan.org"
-
-filter="
- -not -name "*~" -a \
- -not -name ".flock" -a \
- -not -name ".htaccess" -a \
- -not -name ".lastmod" -a \
- -not -name ".pageindex" -a \
-"
-
-pushd /opt/mergedWork
-
-find /opt/pmwiki/wiki.d  ${filter} \
--name "*.*" -type f,l -printf "%P\n" | while read line
-do
-    base=`echo "${line}" | cut -d '.' -f 1`
-    file=`echo "${line}" | cut -d '.' -f 2`
-    time=`date --rfc-3339=seconds -ur /opt/pmwiki/wiki.d/${base}.${file} | cut -d '+' -f 1`
-    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}\nogBase=${base}\nogFile=${file}\ntimestamp=${time}\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
-    cp PmWiki/${base}/${file}.HTM PmWiki/${base}/${file}.HTM_ORIGINAL
-    csplit -ks PmWiki/${base}/${file}.HTM '%<!--PageText-->%' '/<!--HTMLFooter-->/'
-    if [ -f xx00 ]; then
-        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" \
-        -e "s/class='categorylink'//g" \
-        -e "s/class='createlink'//g" \
-        -e "s/class='createlinktext'//g" \
-        -e "s/class='escaped'//g" \
-        -e "s/class='diffmarkup'//g" \
-        -e "s/class='selflink'//g" \
-        -e "s/class='urllink'//g" \
-        -e "s/class='vspace'//g" \
-        -e "s/class='wikilink'//g" \
-        -e "s/style='.*;'//g"
-
-#    pandoc -f markdown -t commonmark_x --self-contained PmWiki//${base}/${file}.MD >PmWiki/${base}/${file}.md
-    pandoc -f html -t commonmark_x --self-contained PmWiki//${base}/${file}.HTM >PmWiki/${base}/${file}.md
-    cp PmWiki/${base}/${file}.md PmWiki/${base}/${file}.md_ORIGINAL
-
-    # Attempt to clean things up, badly.
-    sed -i -E PmWiki/${base}/${file}.md \
-        -e 's/\$/\$dlr\$/g' \
-        -e 's/\{#.*\}//g' \
-        -e '/^:::/d' \
-#       -e '/\[Site$/d' \
-#       -e '/^\[\]/d' \
-#       -e "s/\`<a id='trailstart'>\`\{=html\}\`<\/a>\`\{=html\}//g" \
-#       -e "s/^\`<img /<img /g" \
-#       -e "s/^\`\`\`\{=html\}//g" \
-#       -e "s/^\`\`\`//g" \
-#       -e "s/\`\{=html\}//g"
-
-    ln -frs PmWiki/${base}/${file}.md combined/${base}/${file}.md
-    ln -frs PmWiki/${base}/${file}.md.md combined/${base}/${file}.md.md
-done
-
-popd