updated scripts, sync-intro files

This commit is contained in:
Steven Hugg 2018-07-26 12:44:09 -04:00
parent bc5fe5a5cf
commit 24693ac6eb
10 changed files with 41 additions and 34 deletions

@ -1 +1 @@
Subproject commit ebf81921f80024e3e94c7a8e1235ab59464fa5ef Subproject commit 4334727f0e07acd4541b0a7b8f81a5984cd4aafe

View File

@ -4,8 +4,11 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1"> <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 --> <!-- 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 --> <!-- Bootstrap -->
<link href="bootstrap/css/bootstrap.min.css" rel="stylesheet"> <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"> <nav class="navbar navbar-inverse navbar-fixed-top">
<div class="container"> <div class="container">
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"> <a class="navbar-brand" href="https://twitter.com/8bitworkshop">@8bitworkshop</a>
<span class="sr-only">Toggle navigation</span> <a class="navbar-brand" href="./blog/">Blog</a>
<span class="icon-bar"></span> <a class="navbar-brand" href="https://www.amazon.com/default/e/B01N7J10NF/ref=dp_byline_cont_pop_book_1">Books</a>
<span class="icon-bar"></span> </div>
<span class="icon-bar"></span> <div id="navbar">
</button> <form class="navbar-form navbar-right">
<a class="navbar-brand" href="redir.html">8bitworkshop.com</a> <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>
<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> </div>
</nav> </nav>
@ -96,17 +94,19 @@ if (window.location.host.endsWith('8bitworkshop.com')) {
<a href="redir.html?platform=williams-z80">Williams</a>. <a href="redir.html?platform=williams-z80">Williams</a>.
</p> </p>
</div> </div>
<div class="col-md-4"> <!--
<div class="col-md-4">
<h2>Hardware Design</h2> <h2>Hardware Design</h2>
<p> <p>
Software not enough for you? Software not enough for you?
Use our Use our
<a href="redir.html?platform=verilog">Verilog</a> <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. 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> </p>
</div> </div>
-->
</div> </div>
<h1 class="text-center">Learn More With a Book!</h1> <h1 class="text-center">Learn More With a Book!</h1>

View File

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<title>8bitworkshop</title> <title>8bitworkshop IDE</title>
<style type="text/css" media="screen"> <style type="text/css" media="screen">
body { body {
overflow: hidden !important; overflow: hidden !important;

View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
. ./scripts/env.sh . ./scripts/env.sh
rsync --stats -arilv -e "ssh -p 2222" ./blog/ $RSYNC_PATH/blog/ rsync --stats -rilv -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" ./scripts/ pzp@104.131.86.119:./backups

View File

@ -2,6 +2,6 @@
. ./scripts/env.sh . ./scripts/env.sh
DESTPATH=$RSYNC_PATH/dev/ 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 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/

9
scripts/sync-intro.sh Executable file
View File

@ -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."

View File

@ -4,7 +4,7 @@
DESTPATH=$RSYNC_PATH/ DESTPATH=$RSYNC_PATH/
echo "Upload HEAD to production? [Press Enter]" echo "Upload HEAD to production? [Press Enter]"
read 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 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." echo "Done."

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
DESTPATH=$RSYNC_PATH/staging/ 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 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/

View File

@ -2,4 +2,4 @@
. ./scripts/env.sh . ./scripts/env.sh
DESTPATH=$RSYNC_PATH/ DESTPATH=$RSYNC_PATH/
rsync --stats -arilv -e "ssh -p 2222" ./release/ $DESTPATH/release rsync --stats -rilv -e "ssh -p 2222" ./release/ $DESTPATH/release

View File

@ -20,9 +20,7 @@ rm -fr $TMPDIR
mkdir -p $TMPDIR mkdir -p $TMPDIR
git archive $VERSION | tar x -C $TMPDIR git archive $VERSION | tar x -C $TMPDIR
echo "Copying to $DESTPATH..." echo "Copying to $DESTPATH..."
rsync --stats --exclude '.*' --exclude 'scripts/*' --exclude=node_modules --copy-dest=$DEVPATH -aril -e "ssh -p 2222" $TMPDIR/ $SUBMODS $DESTPATH rsync --stats --exclude '.*' --exclude 'scripts/*' --exclude=node_modules --copy-dest=$DEVPATH -rilz -e "ssh -p 2222" $TMPDIR/ $SUBMODS $DESTPATH
rsync -a -e "ssh -p 2222" redir.html $DESTPATH/../index.html git archive --format tar.gz --prefix 8bitworkshop- HEAD tools/ > release/8bitworkshop-tools-$VERSION.tgz
#git ls-files -z |
git archive --format tar.gz --prefix 8bitworkshop- HEAD tools/ > release/8bitworkshop-tools.tgz
#rsync --stats -arilvz -e "ssh -p 2222" ./mame $DESTPATH/ #rsync --stats -arilvz -e "ssh -p 2222" ./mame $DESTPATH/
echo "Done." echo "Done."