summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2016-03-01 18:46:01 +0100
committerFlorian Dold <florian.dold@gmail.com>2016-03-01 18:46:01 +0100
commit96f0b22210e8625446cc4bb924e5dcc5ee6bed7e (patch)
treea9414655723eee9819f10f60879562350a9a0967
parentf7bc9d5b1cecd9f8d9168e221d833d08e4e1a6f4 (diff)
downloaddeployment-96f0b22210e8625446cc4bb924e5dcc5ee6bed7e.tar.gz
deployment-96f0b22210e8625446cc4bb924e5dcc5ee6bed7e.tar.bz2
deployment-96f0b22210e8625446cc4bb924e5dcc5ee6bed7e.zip
always use arm wrapper
-rwxr-xr-xarm.sh2
-rwxr-xr-xstart.sh11
-rwxr-xr-xupdate_bank.sh8
-rwxr-xr-xupdate_exchange.sh7
-rwxr-xr-xupdate_merchant.sh7
5 files changed, 15 insertions, 20 deletions
diff --git a/arm.sh b/arm.sh
index 204d6bb..cb55f17 100755
--- a/arm.sh
+++ b/arm.sh
@@ -7,4 +7,4 @@ cd $HOME
ulimit -c $((100 * 1024))
-gnunet-arm "$@"
+gnunet-arm -c $HOME/deployment/gnunet.conf -T5s "$@"
diff --git a/start.sh b/start.sh
index d410018..1262f20 100755
--- a/start.sh
+++ b/start.sh
@@ -1,13 +1,12 @@
#!/bin/bash
-export GNUNET_BASE_CONFIG=$HOME/deployment/taler-arm
-export PATH="$HOME/local/bin":$PATH
+export PATH="$HOME/deployment":$PATH
ulimit -c $((100 * 1024))
cd $HOME
-gnunet-arm -s
-gnunet-arm -i taler-mint
-gnunet-arm -i taler-merchant
-gnunet-arm -i taler-demobank
+arm.sh -s
+arm.sh -i taler-mint
+arm.sh -i taler-merchant
+arm.sh -i taler-demobank
diff --git a/update_bank.sh b/update_bank.sh
index 788abb7..16b61fd 100755
--- a/update_bank.sh
+++ b/update_bank.sh
@@ -1,11 +1,9 @@
#!/bin/bash
-
-export GNUNET_BASE_CONFIG=$HOME/deployment/taler-arm
-export PATH="$HOME/local/bin":$PATH
+export PATH="$HOME/deployment":$PATH
cd $HOME/bank/ && \
git pull && \
cd $HOME/deployment && \
- gnunet-arm -k taler-demobank
-gnunet-arm -i taler-demobank
+ arm.sh -k taler-demobank
+arm.sh -i taler-demobank
diff --git a/update_exchange.sh b/update_exchange.sh
index e1403df..ace2468 100755
--- a/update_exchange.sh
+++ b/update_exchange.sh
@@ -1,7 +1,6 @@
#!/bin/bash
-export GNUNET_BASE_CONFIG=$HOME/deployment/taler-arm
-export PATH="$HOME/local/bin":$PATH
+export PATH="$HOME/deployment":$PATH
build_exchange() {
(
@@ -24,5 +23,5 @@ cd $HOME/exchange && \
git pull && \
cd $HOME/deployment && \
build_exchange && \
- gnunet-arm -k taler-exchange
-gnunet-arm -i taler-exchange
+ arm.sh -k taler-exchange
+arm.sh -i taler-exchange
diff --git a/update_merchant.sh b/update_merchant.sh
index 80f8d1a..7defec3 100755
--- a/update_merchant.sh
+++ b/update_merchant.sh
@@ -1,7 +1,6 @@
#!/bin/bash
-export GNUNET_BASE_CONFIG=$HOME/deployment/taler-arm
-export PATH="$HOME/local/bin":$PATH
+export PATH="$HOME/deployment":$PATH
build_merchant() {
(
@@ -24,5 +23,5 @@ cd $HOME/merchant/ && \
git pull && \
cd $HOME/deployment && \
build_merchant && \
- gnunet-arm -k taler-merchant
-gnunet-arm -i taler-merchant
+ arm.sh -k taler-merchant
+arm.sh -i taler-merchant