diff options
author | Florian Dold <florian.dold@gmail.com> | 2016-05-19 18:54:17 +0200 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2016-05-19 18:54:17 +0200 |
commit | 113b586c34f256504fa9ffa829b779f912e210db (patch) | |
tree | 069635932988f8704cfb43f235058d1be1c5e920 | |
parent | 9c110443e261c1ec7c467b30dd62f6adde9a0ea1 (diff) | |
download | deployment-113b586c34f256504fa9ffa829b779f912e210db.tar.gz deployment-113b586c34f256504fa9ffa829b779f912e210db.tar.bz2 deployment-113b586c34f256504fa9ffa829b779f912e210db.zip |
fix script / remove obsolete scripts
-rwxr-xr-x | bootstrap-bluegreen | 10 | ||||
-rwxr-xr-x | bootstrap-demo | 38 | ||||
-rwxr-xr-x | bootstrap-test | 36 |
3 files changed, 9 insertions, 75 deletions
diff --git a/bootstrap-bluegreen b/bootstrap-bluegreen index 5f15aaf..415d733 100755 --- a/bootstrap-bluegreen +++ b/bootstrap-bluegreen @@ -19,6 +19,7 @@ set -eu usage() { + ech "Usage:" echo "$0: DEPLOYMENT_BASENAME" } @@ -29,6 +30,13 @@ fi DEPLOYMENT_BASENAME=$1 +BRANCH=master +case $DEPLOYMENT_BASENAME in + demo) + BRANCH=stable + ;; +esac + cd $HOME if ! test -d $HOME/gnunet; then @@ -46,7 +54,7 @@ for component in bank merchant gnurl landing exchange merchant-frontends deploym done for component in bank merchant landing exchange merchant-frontends; do - git -C $HOME/$component checkout stable + git -C $HOME/$component checkout $BRANCH done cat >$HOME/activate <<EOL diff --git a/bootstrap-demo b/bootstrap-demo deleted file mode 100755 index 07522bc..0000000 --- a/bootstrap-demo +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -set -eu - -base=$HOME - -mkdir -p $base - -cd $base - -if ! test -d $base/gnunet; then - svn checkout https://gnunet.org/svn/gnunet -fi - -if ! test -d $base/libmicrohttpd; then - svn checkout https://gnunet.org/svn/libmicrohttpd -fi - -for component in bank merchant gnurl landing exchange merchant-frontends deployment; do - if ! test -d $base/$component; then - git clone /var/git/$component.git - fi -done - -for component in bank merchant landing exchange merchant-frontends; do - git -C $base/$component checkout stable -done - -cat >$base/activate <<EOL -#!/bin/bash -export PATH="$base/local/bin:$base/deployment/bin:\$PATH" -EOL - -mkdir -p $base/.config -ln -sft $base/.config $base/deployment/config/demo.taler.net/taler.conf -ln -sft $base/.config $base/deployment/config/demo.taler.net/taler - -ln -sf "/home/demo/shared-data" "$base" diff --git a/bootstrap-test b/bootstrap-test deleted file mode 100755 index 367559a..0000000 --- a/bootstrap-test +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -set -eu - -base=$HOME - -mkdir -p $base - -cd $base - -if ! test -d $base/gnunet; then - svn checkout https://gnunet.org/svn/gnunet -fi - -if ! test -d $base/libmicrohttpd; then - svn checkout https://gnunet.org/svn/libmicrohttpd -fi - -for component in bank merchant gnurl landing exchange merchant-frontends deployment; do - if ! test -d $base/$component; then - git clone /var/git/$component.git - fi -done - -cat >$base/activate <<EOL -#!/bin/bash -export PATH="$base/local/bin:$base/deployment/bin:\$PATH" -export TALER_EXCHANGEDB_POSTGRES_CONFIG="postgres:///talercheck-\$USER" -export TALER_MERCHANTDB_POSTGRES_CONFIG="postgres:///talercheck-\$USER" -EOL - -mkdir -p $base/.config -ln -sft "$base/.config" "$base/deployment/config/test.taler.net/taler.conf" -ln -sft "$base/.config" "$base/deployment/config/test.taler.net/taler" - -ln -sf "/home/test/shared-data" "$base" |