From 24693ac6eb99283fa9214aef324e9f523eb60c2c Mon Sep 17 00:00:00 2001
From: Steven Hugg <hugg@fasterlight.com>
Date: Thu, 26 Jul 2018 12:44:09 -0400
Subject: [PATCH] updated scripts, sync-intro files

---
 codemirror                   |  2 +-
 demo.html                    | 38 ++++++++++++++++++------------------
 index.html                   |  2 +-
 scripts/sync-blog.sh         |  4 ++--
 scripts/sync-dev.sh          |  4 ++--
 scripts/sync-intro.sh        |  9 +++++++++
 scripts/sync-production.sh   |  4 ++--
 scripts/sync-staging.sh      |  4 ++--
 scripts/sync-tools.sh        |  2 +-
 scripts/sync-version-prod.sh |  6 ++----
 10 files changed, 41 insertions(+), 34 deletions(-)
 create mode 100755 scripts/sync-intro.sh

diff --git a/codemirror b/codemirror
index ebf81921..4334727f 160000
--- a/codemirror
+++ b/codemirror
@@ -1 +1 @@
-Subproject commit ebf81921f80024e3e94c7a8e1235ab59464fa5ef
+Subproject commit 4334727f0e07acd4541b0a7b8f81a5984cd4aafe
diff --git a/demo.html b/demo.html
index 19a37fdf..06e959e3 100644
--- a/demo.html
+++ b/demo.html
@@ -4,8 +4,11 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
+<meta http-equiv="Pragma" content="no-cache" />
+<meta http-equiv="Expires" content="0" />
     <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
-    <title>Bootstrap 101 Template</title>
+    <title>8bitworkshop</title>
 
     <!-- Bootstrap -->
     <link href="bootstrap/css/bootstrap.min.css" rel="stylesheet">
@@ -31,22 +34,17 @@ if (window.location.host.endsWith('8bitworkshop.com')) {
     <nav class="navbar navbar-inverse navbar-fixed-top">
       <div class="container">
         <div class="navbar-header">
-          <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-          <a class="navbar-brand" href="redir.html">8bitworkshop.com</a>
+          <a class="navbar-brand" href="https://twitter.com/8bitworkshop">@8bitworkshop</a>
+          <a class="navbar-brand" href="./blog/">Blog</a>
+          <a class="navbar-brand" href="https://www.amazon.com/default/e/B01N7J10NF/ref=dp_byline_cont_pop_book_1">Books</a>
+        </div>
+        <div id="navbar">
+         <form class="navbar-form navbar-right">
+           <a class="btn btn-default" href="redir.html" role="button">Continue to 8bitworkshop IDE
+            <span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span>
+           </a>
+         </form>
         </div>
-        <div id="navbar" class="navbar-collapse collapse">
-          <form class="navbar-form navbar-right">
-            <button type="button" class="btn btn-default" aria-label="Continue to IDE Button">
-              Continue to IDE
-              <span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span>
-            </button>
-          </form>
-        </div><!--/.navbar-collapse -->
       </div>
     </nav>
 
@@ -96,17 +94,19 @@ if (window.location.host.endsWith('8bitworkshop.com')) {
           <a href="redir.html?platform=williams-z80">Williams</a>.
           </p>
        </div>
-        <div class="col-md-4">
+       <!--
+       <div class="col-md-4">
           <h2>Hardware Design</h2>
           <p>
           Software not enough for you?
           Use our
           <a href="redir.html?platform=verilog">Verilog</a>
-          compiler to design a 8-bit game platform.
+          compiler to design a 8-bit game platform from scratch.
           We'll run your design in real time in the browser, showing the output on a simulated CRT.
-          Plenty of examples are available.
+          Plenty of examples are available to teach logic programming.
           </p>
         </div>
+      -->
       </div>
 
     <h1 class="text-center">Learn More With a Book!</h1>
diff --git a/index.html b/index.html
index f70b9fe0..c8a72bdd 100644
--- a/index.html
+++ b/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-<title>8bitworkshop</title>
+<title>8bitworkshop IDE</title>
 <style type="text/css" media="screen">
 body {
   overflow: hidden !important;
diff --git a/scripts/sync-blog.sh b/scripts/sync-blog.sh
index a7f4a876..3934cd1e 100755
--- a/scripts/sync-blog.sh
+++ b/scripts/sync-blog.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 . ./scripts/env.sh
-rsync --stats -arilv -e "ssh -p 2222" ./blog/  $RSYNC_PATH/blog/
-#rsync --stats -arilv -e "ssh -p 2222" ./scripts/  pzp@104.131.86.119:./backups
+rsync --stats -rilv -e "ssh -p 2222" ./blog/  $RSYNC_PATH/blog/
+#rsync --stats -rilv -e "ssh -p 2222" ./scripts/  pzp@104.131.86.119:./backups
diff --git a/scripts/sync-dev.sh b/scripts/sync-dev.sh
index 59f56bf8..098630f7 100755
--- a/scripts/sync-dev.sh
+++ b/scripts/sync-dev.sh
@@ -2,6 +2,6 @@
 
 . ./scripts/env.sh
 DESTPATH=$RSYNC_PATH/dev/
-git ls-files -z | rsync --stats --exclude '.*' --exclude 'scripts/*' --exclude=node_modules -aril -e "ssh -p 2222" --files-from - -0 . $DESTPATH
+git ls-files -z | rsync --stats --exclude '.*' --exclude 'scripts/*' --exclude=node_modules -ril -e "ssh -p 2222" --files-from - -0 . $DESTPATH
 git archive --format tar.gz --prefix 8bitworkshop- HEAD tools/ > release/8bitworkshop-tools.tgz
-rsync --stats -arilvz -e "ssh -p 2222" ./gen ./mame  $DESTPATH/
+rsync --stats -rilvz -e "ssh -p 2222" ./gen ./mame  $DESTPATH/
diff --git a/scripts/sync-intro.sh b/scripts/sync-intro.sh
new file mode 100755
index 00000000..9d341bfb
--- /dev/null
+++ b/scripts/sync-intro.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+. ./scripts/env.sh
+grep "var VERSION" redir.html
+mkdir -p .tmp
+cp demo.html .tmp/index.html
+rsync -rpilv --chmod=a+rx -e "ssh -p 2222" .tmp/index.html redir.html css bootstrap images $RSYNC_PATH/
+rm -fr .tmp
+echo "Done."
diff --git a/scripts/sync-production.sh b/scripts/sync-production.sh
index 36b9e0c5..9ab0d00f 100755
--- a/scripts/sync-production.sh
+++ b/scripts/sync-production.sh
@@ -4,7 +4,7 @@
 DESTPATH=$RSYNC_PATH/
 echo "Upload HEAD to production? [Press Enter]"
 read
-git ls-files -z | rsync --stats --exclude '.*' --exclude 'scripts/*' --exclude=node_modules -aril -e "ssh -p 2222" --files-from - -0 . $DESTPATH
+git ls-files -z | rsync --stats --exclude '.*' --exclude 'scripts/*' --exclude=node_modules -ril -e "ssh -p 2222" --files-from - -0 . $DESTPATH
 git archive --format tar.gz --prefix 8bitworkshop- HEAD tools/ > release/8bitworkshop-tools.tgz
-#rsync --stats -arilvz -e "ssh -p 2222" ./mame  $DESTPATH/
+#rsync --stats -rilvz -e "ssh -p 2222" ./mame  $DESTPATH/
 echo "Done."
diff --git a/scripts/sync-staging.sh b/scripts/sync-staging.sh
index f7210bbc..515c55cb 100755
--- a/scripts/sync-staging.sh
+++ b/scripts/sync-staging.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 DESTPATH=$RSYNC_PATH/staging/
-git ls-files -z | rsync --stats --exclude '.*' --exclude 'scripts/*' --exclude=node_modules -aril -e "ssh -p 2222" --files-from - -0 . $DESTPATH
+git ls-files -z | rsync --stats --exclude '.*' --exclude 'scripts/*' --exclude=node_modules -ril -e "ssh -p 2222" --files-from - -0 . $DESTPATH
 git archive --format tar.gz --prefix 8bitworkshop- HEAD tools/ > release/8bitworkshop-tools.tgz
-rsync --stats -arilvz -e "ssh -p 2222" ./mame  $DESTPATH/
+rsync --stats -rilvz -e "ssh -p 2222" ./mame  $DESTPATH/
diff --git a/scripts/sync-tools.sh b/scripts/sync-tools.sh
index 9c3bacaf..35f851b3 100755
--- a/scripts/sync-tools.sh
+++ b/scripts/sync-tools.sh
@@ -2,4 +2,4 @@
 
 . ./scripts/env.sh
 DESTPATH=$RSYNC_PATH/
-rsync --stats -arilv -e "ssh -p 2222" ./release/  $DESTPATH/release
+rsync --stats -rilv -e "ssh -p 2222" ./release/  $DESTPATH/release
diff --git a/scripts/sync-version-prod.sh b/scripts/sync-version-prod.sh
index 25bb8111..56de4697 100755
--- a/scripts/sync-version-prod.sh
+++ b/scripts/sync-version-prod.sh
@@ -20,9 +20,7 @@ rm -fr $TMPDIR
 mkdir -p $TMPDIR
 git archive $VERSION | tar x -C $TMPDIR
 echo "Copying to $DESTPATH..."
-rsync --stats --exclude '.*' --exclude 'scripts/*' --exclude=node_modules --copy-dest=$DEVPATH -aril -e "ssh -p 2222" $TMPDIR/ $SUBMODS $DESTPATH
-rsync -a -e "ssh -p 2222" redir.html $DESTPATH/../index.html
-#git ls-files -z | 
-git archive --format tar.gz --prefix 8bitworkshop- HEAD tools/ > release/8bitworkshop-tools.tgz
+rsync --stats --exclude '.*' --exclude 'scripts/*' --exclude=node_modules --copy-dest=$DEVPATH -rilz -e "ssh -p 2222" $TMPDIR/ $SUBMODS $DESTPATH
+git archive --format tar.gz --prefix 8bitworkshop- HEAD tools/ > release/8bitworkshop-tools-$VERSION.tgz
 #rsync --stats -arilvz -e "ssh -p 2222" ./mame  $DESTPATH/
 echo "Done."