From f4f86ee020b2736f79123655457d479e76531d15 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Tue, 26 Apr 2016 03:06:41 +0200
Subject: move scripts

---
 arm.sh            | 21 ---------------------
 bin/taler-arm     | 21 +++++++++++++++++++++
 bin/taler-restart | 18 ++++++++++++++++++
 bin/taler-start   | 16 ++++++++++++++++
 bootstrap         |  2 +-
 restart.sh        | 18 ------------------
 start.sh          | 16 ----------------
 7 files changed, 56 insertions(+), 56 deletions(-)
 delete mode 100755 arm.sh
 create mode 100755 bin/taler-arm
 create mode 100755 bin/taler-restart
 create mode 100755 bin/taler-start
 delete mode 100755 restart.sh
 delete mode 100755 start.sh

diff --git a/arm.sh b/arm.sh
deleted file mode 100755
index 1b30523..0000000
--- a/arm.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-# Deployment color (for green-blue deployments)
-# For colorless deployments, it's set to "."
-base=${TALER_DEPLOYMENT_BASE:-$HOME}
-
-logdir=$base/logs
-
-export GNUNET_BASE_CONFIG=$base/deployment/taler-arm
-export PATH="$base/local/bin":$PATH
-
-export GNUNET_FORCE_LOGFILE=$logdir/taler-%Y-%m-%d.log
-export GNUNET_FORCE_LOG="taler;;;;DEBUG/arm;;;;INFO"
-
-cd $HOME/$color
-
-ulimit -c $((100 * 1024))
-
-mkdir -p $logdir
-
-exec gnunet-arm -c $base/deployment/gnunet.conf -T5s "$@"
diff --git a/bin/taler-arm b/bin/taler-arm
new file mode 100755
index 0000000..1b30523
--- /dev/null
+++ b/bin/taler-arm
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# Deployment color (for green-blue deployments)
+# For colorless deployments, it's set to "."
+base=${TALER_DEPLOYMENT_BASE:-$HOME}
+
+logdir=$base/logs
+
+export GNUNET_BASE_CONFIG=$base/deployment/taler-arm
+export PATH="$base/local/bin":$PATH
+
+export GNUNET_FORCE_LOGFILE=$logdir/taler-%Y-%m-%d.log
+export GNUNET_FORCE_LOG="taler;;;;DEBUG/arm;;;;INFO"
+
+cd $HOME/$color
+
+ulimit -c $((100 * 1024))
+
+mkdir -p $logdir
+
+exec gnunet-arm -c $base/deployment/gnunet.conf -T5s "$@"
diff --git a/bin/taler-restart b/bin/taler-restart
new file mode 100755
index 0000000..291197a
--- /dev/null
+++ b/bin/taler-restart
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+base=${TALER_DEPLOYMENT_BASE:-$HOME}
+
+export PATH="$base/deployment":$PATH
+
+ulimit -c $((100 * 1024))
+
+cd $HOME
+
+arm.sh -e -T 1s &>/dev/null
+
+arm.sh -s
+arm.sh -i taler-exchange
+arm.sh -i taler-merchant
+arm.sh -i taler-demobank
+arm.sh -i taler-donations
+arm.sh -i taler-blog
diff --git a/bin/taler-start b/bin/taler-start
new file mode 100755
index 0000000..d122dd6
--- /dev/null
+++ b/bin/taler-start
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+base=${TALER_DEPLOYMENT_BASE:-$HOME}
+
+export PATH="$base/deployment":$PATH
+
+ulimit -c $((100 * 1024))
+
+cd $HOME
+
+arm.sh -s
+arm.sh -i taler-exchange
+arm.sh -i taler-merchant
+arm.sh -i taler-demobank
+arm.sh -i taler-donations
+arm.sh -i taler-blog
diff --git a/bootstrap b/bootstrap
index 2500be8..899657a 100755
--- a/bootstrap
+++ b/bootstrap
@@ -26,7 +26,7 @@ cat >$base/activate <<EOL
 #!/bin/bash
 export TALER_DEPLOYMENT_BASE=$base
 export TALER_PREFIX=$base/local
-export PATH="$base/local/bin:\$PATH"
+export PATH="$base/local/bin:$base/deployment/bin:\$PATH"
 EOL
 
 mkdir -p $base/config
diff --git a/restart.sh b/restart.sh
deleted file mode 100755
index 291197a..0000000
--- a/restart.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-base=${TALER_DEPLOYMENT_BASE:-$HOME}
-
-export PATH="$base/deployment":$PATH
-
-ulimit -c $((100 * 1024))
-
-cd $HOME
-
-arm.sh -e -T 1s &>/dev/null
-
-arm.sh -s
-arm.sh -i taler-exchange
-arm.sh -i taler-merchant
-arm.sh -i taler-demobank
-arm.sh -i taler-donations
-arm.sh -i taler-blog
diff --git a/start.sh b/start.sh
deleted file mode 100755
index d122dd6..0000000
--- a/start.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-base=${TALER_DEPLOYMENT_BASE:-$HOME}
-
-export PATH="$base/deployment":$PATH
-
-ulimit -c $((100 * 1024))
-
-cd $HOME
-
-arm.sh -s
-arm.sh -i taler-exchange
-arm.sh -i taler-merchant
-arm.sh -i taler-demobank
-arm.sh -i taler-donations
-arm.sh -i taler-blog
-- 
cgit v1.2.3