make Web site builds satisfy #5898

4 files changed, 34 insertions, 18 deletions

diff --git a/taler-sitesbuild/update_buywith_page.sh b/taler-sitesbuild/update_buywith_page.sh
index f142c6f..14980a8 100755
--- a/taler-sitesbuild/update_buywith_page.sh
+++ b/taler-sitesbuild/update_buywith_page.sh
@@ -14,11 +14,14 @@ cd $HOME/buywith/
 fetch
 git submodule update --force --init
 
-mkdir -p $HOME/buywith.taler.net/
+# Generate current version under 'work in progress' (wip) folder
+mkdir -p $HOME/buywith.taler.net.wip/
+cp -r web/* $HOME/buywith.taler.net.wip/
+chmod -R g+rx $HOME/buywith.taler.net.wip/
 
-# delete old content
-rm -fr $HOME/buywith.taler.net/*
+# delete ancient version (if any)
+rm -fr $HOME/buywith.taler.net.old/
 
-cp -rt $HOME/buywith.taler.net/ web/*
-
-chmod -R g+rx $HOME/buywith.taler.net/
+# Finally, do two fast renames to make the current version active
+mv $HOME/buywith.taler.net/ $HOME/buywith.taler.net.old/
+mv $HOME/buywith.taler.net.wip/ $HOME/buywith.taler.net/
diff --git a/taler-sitesbuild/update_stage.sh b/taler-sitesbuild/update_stage.sh
index c86649c..4fce43f 100755
--- a/taler-sitesbuild/update_stage.sh
+++ b/taler-sitesbuild/update_stage.sh
@@ -16,8 +16,13 @@ cd $HOME/www
 git checkout master -f
 fetch
 git submodule update --init --force
+# Generate current version under 'work in progress' (wip) folder
 ./bootstrap
-./configure --variant=stage.taler.net --prefix=$HOME
-make uninstall
+./configure --variant=stage.taler.net.wip --prefix=$HOME
 make install
-chmod -R g+rx $HOME/stage.taler.net/
+chmod -R g+rx $HOME/stage.taler.net.wip/
+# Clean up 'ancient' version (before previous)
+rm -rf $HOME/stage.taler.net.old/
+# Finally, do two fast renames to make the current version active
+mv $HOME/stage.taler.net/ $HOME/stage.taler.net.old/ || true
+mv $HOME/stage.taler.net.wip/ $HOME/stage.taler.net/
diff --git a/taler-sitesbuild/update_twister_page.sh b/taler-sitesbuild/update_twister_page.sh
index 9d4b2ec..0bbb4e4 100755
--- a/taler-sitesbuild/update_twister_page.sh
+++ b/taler-sitesbuild/update_twister_page.sh
@@ -14,11 +14,14 @@ cd $HOME/twister/
 fetch
 git submodule update --force --init
 
-mkdir -p $HOME/twister.taler.net/
+# Generate current version under 'work in progress' (wip) folder
+mkdir -p $HOME/twister.taler.net.wip/
+cp -r web/* $HOME/twister.taler.net.wip/
+chmod -R g+rx $HOME/twister.taler.net.wip/
 
-# delete old content
-rm -fr $HOME/twister.taler.net/*
+# delete ancient version (if any)
+rm -fr $HOME/twister.taler.net.old/*
 
-cp -rt $HOME/twister.taler.net/ web/*
-
-chmod -R g+rx $HOME/twister.taler.net/
+# Finally, do two fast renames to make the current version active
+mv $HOME/twister.taler.net/ $HOME/twister.taler.net.old/
+mv $HOME/twister.taler.net.wip/ $HOME/twister.taler.net/
diff --git a/taler-sitesbuild/update_www.sh b/taler-sitesbuild/update_www.sh
index a27a3f0..67d50e0 100755
--- a/taler-sitesbuild/update_www.sh
+++ b/taler-sitesbuild/update_www.sh
@@ -17,8 +17,13 @@ git checkout stable -f
 fetch
 git submodule update --init --force
 ./bootstrap
-./configure --variant=www.taler.net --prefix=$HOME
-make uninstall
+./configure --variant=www.taler.net.wip --prefix=$HOME
 make install
 
-chmod -R g+rx $HOME/www.taler.net/
+chmod -R g+rx $HOME/www.taler.net.wip/
+
+# Clean up 'ancient' version (before previous)
+rm -rf $HOME/www.taler.net.old/
+# Finally, do two fast renames to make the current version active
+mv $HOME/www.taler.net/ $HOME/www.taler.net.old/ || true
+mv $HOME/www.taler.net.wip/ $HOME/www.taler.net/