summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Maunz <andreas@maunz.de>2012-09-11 12:57:13 +0200
committerAndreas Maunz <andreas@maunz.de>2012-09-11 12:57:13 +0200
commit67fc8c7235bdfdb3dac7adf31141601ec540f97c (patch)
tree4ecc5ec83b971814f77877c5ecb1a2c836960b56
parentfcb0574da3d9e52ad68669b7c84e0a8e029ad240 (diff)
parent43fa88e989ab0b846a91f49b381895c983fe95c2 (diff)
Merge branch 'development' of github.com:opentox/opentox-client into development
-rwxr-xr-xbin/opentox-client-install22
1 files changed, 17 insertions, 5 deletions
diff --git a/bin/opentox-client-install b/bin/opentox-client-install
index 61e2edf..17e20f2 100755
--- a/bin/opentox-client-install
+++ b/bin/opentox-client-install
@@ -6,10 +6,20 @@
SELF=$(basename $0 -install)
[ "`id -u`" = "0" ] && echo "This script must be run as non-root." 1>&2 && exit 1
-echo
-echo "Welcome to service installation (<Return> to continue)."
-read delete_me
-
+SILENT=false
+if [ -n "$1" ]
+then
+ if [ "$1" = "silent" ]
+ then
+ SILENT=true
+ fi
+fi
+
+if [ $SILENT = false ]; then
+ echo
+ echo "Welcome to service installation (<Return> to continue)."
+ read delete_me
+fi
# check wd is root of service
DIR=`pwd`
@@ -40,7 +50,9 @@ install_ruby
echo
install_with_bundler
-notify
+if [ $SILENT = false ]; then
+ notify
+fi
# return to wd
cd "$DIR"