From 6661f91e1d280455fa16ca4d4b4f6b88316f587b Mon Sep 17 00:00:00 2001 From: Florian Staudacher Date: Mon, 14 May 2012 13:01:49 +0200 Subject: [PATCH] make sure bundler is installed, be more specific in 'welcome' message [ci skip] --- script/install.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/script/install.sh b/script/install.sh index 13dd9738f..3ba511261 100755 --- a/script/install.sh +++ b/script/install.sh @@ -32,7 +32,7 @@ other ideas what we could do # # #### #### -BINARIES="git ruby gem bundle sed" # required programs +BINARIES="git ruby gem bundle sed mktemp" # required programs D_GIT_CLONE_PATH="/srv/diaspora" # path for diaspora @@ -257,6 +257,8 @@ prepare_install_env() { install_or_use_ruby load_rvmrc js_runtime_check + + run_or_error "gem install bundler" } # do some sanity checking @@ -344,10 +346,18 @@ database_setup() { # display a nice welcome message define WELCOME_MSG <<'EOT' ##################################################################### + DIASPORA* INSTALL SCRIPT +---- + This script will guide you through the basic steps -to get a copy of Diaspora* up and running +to get a DEVELOPMENT setup of Diaspora* up and running + +For a PRODUCTION installation, please do *not* use this script! +Follow the guide in our wiki, instead: +-- https://github.com/diaspora/diaspora/wiki/Installation-Guides + ##################################################################### EOT