From b6604faf6767d31e26f7e539a7eb4861327f5e03 Mon Sep 17 00:00:00 2001 From: Steven Hugg Date: Mon, 6 Aug 2018 17:29:59 -0400 Subject: [PATCH] updated redir.html and tools --- demo.html | 4 ++-- redir.html | 9 +++++---- scripts/sync-blog.sh | 2 +- scripts/sync-dev.sh | 2 +- scripts/sync-production.sh | 10 ---------- scripts/sync-staging.sh | 6 ------ scripts/sync-tools.sh | 2 +- scripts/sync-version-prod.sh | 4 ++-- 8 files changed, 12 insertions(+), 27 deletions(-) delete mode 100755 scripts/sync-production.sh delete mode 100755 scripts/sync-staging.sh diff --git a/demo.html b/demo.html index fa358ee9..2a519310 100644 --- a/demo.html +++ b/demo.html @@ -41,7 +41,7 @@ if (window.location.host.endsWith('8bitworkshop.com')) { diff --git a/redir.html b/redir.html index da9ecdfe..f756f7ec 100644 --- a/redir.html +++ b/redir.html @@ -1,14 +1,15 @@ - - + + diff --git a/scripts/sync-blog.sh b/scripts/sync-blog.sh index 3934cd1e..c410e1e5 100755 --- a/scripts/sync-blog.sh +++ b/scripts/sync-blog.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash . ./scripts/env.sh rsync --stats -rilv -e "ssh -p 2222" ./blog/ $RSYNC_PATH/blog/ diff --git a/scripts/sync-dev.sh b/scripts/sync-dev.sh index 23612122..0c085f37 100755 --- a/scripts/sync-dev.sh +++ b/scripts/sync-dev.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash . ./scripts/env.sh DESTPATH=$RSYNC_PATH/dev/ diff --git a/scripts/sync-production.sh b/scripts/sync-production.sh deleted file mode 100755 index 9ab0d00f..00000000 --- a/scripts/sync-production.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -. ./scripts/env.sh -DESTPATH=$RSYNC_PATH/ -echo "Upload HEAD to production? [Press Enter]" -read -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 -rilvz -e "ssh -p 2222" ./mame $DESTPATH/ -echo "Done." diff --git a/scripts/sync-staging.sh b/scripts/sync-staging.sh deleted file mode 100755 index 515c55cb..00000000 --- a/scripts/sync-staging.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -DESTPATH=$RSYNC_PATH/staging/ -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 -rilvz -e "ssh -p 2222" ./mame $DESTPATH/ diff --git a/scripts/sync-tools.sh b/scripts/sync-tools.sh index 35f851b3..a7bdea22 100755 --- a/scripts/sync-tools.sh +++ b/scripts/sync-tools.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash . ./scripts/env.sh DESTPATH=$RSYNC_PATH/ diff --git a/scripts/sync-version-prod.sh b/scripts/sync-version-prod.sh index 91090ac1..1f213f96 100755 --- a/scripts/sync-version-prod.sh +++ b/scripts/sync-version-prod.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash . ./scripts/env.sh VERSION=`git tag | tail -1` @@ -9,7 +9,7 @@ if [ "$VERSION" == "" ]; then fi DESTPATH=$RSYNC_PATH/v$VERSION DEVPATH=/var/www/8bitworkshop.com/dev -TMPDIR=/tmp/8bitws/$VERSION +TMPDIR=./tmp/$VERSION grep "var VERSION" redir.html echo "Upload version $VERSION to production? (edited redir.html?)" read