nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add clarifying message to install script (+ fix typo) [ci skip]

Browse source
This commit is contained in:
Florian Staudacher 2013-01-08 10:11:12 +01:00
parent c6f92198ba
commit b97786661d
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
script/install.sh
View file

@ -375,7 +375,7 @@ git_stuff_check() {
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
# not a git repo, create it? # not a git repo, create it?
printf "the folder you specified does not exist or doesn't contain a git repo\n" printf "the folder you specified does not exist or doesn't contain a git repo\n"
read -p "Press [Enter] to create it and contine... " read -p "Press [Enter] to create it and continue... "
run_or_error "mkdir -p -v \"$D_GIT_CLONE_PATH\"" # only if it doesn't exist run_or_error "mkdir -p -v \"$D_GIT_CLONE_PATH\"" # only if it doesn't exist
run_or_error "git clone \"$D_REMOTE_REPO_URL\" \"$D_GIT_CLONE_PATH\"" run_or_error "git clone \"$D_REMOTE_REPO_URL\" \"$D_GIT_CLONE_PATH\""
else else
@ -404,13 +404,16 @@ database_question() {
;; ;;
esac esac
done done
printf "\n"
} }
# ask for database credentials # ask for database credentials
database_credentials() { database_credentials() {
read -e -p "DB hostname: " D_DB_HOST printf "Please specify the database credentials\n(the user must be existent and allowed to create new databases)\n"
read -e -p "DB username: " D_DB_USER read -e -p "hostname: " D_DB_HOST
read -e -p "DB password: " D_DB_PASS read -e -p "username: " D_DB_USER
read -e -p "password: " D_DB_PASS
run_or_error "sed -i'' -e \"s/\(host:\)[^\n]*/\1 $D_DB_HOST/g\" \"$D_DB_CONFIG_FILE\"" run_or_error "sed -i'' -e \"s/\(host:\)[^\n]*/\1 $D_DB_HOST/g\" \"$D_DB_CONFIG_FILE\""
run_or_error "sed -i'' -e \"s/\(username:\)[^\n]*/\1 $D_DB_USER/g\" \"$D_DB_CONFIG_FILE\"" run_or_error "sed -i'' -e \"s/\(username:\)[^\n]*/\1 $D_DB_USER/g\" \"$D_DB_CONFIG_FILE\""
@ -429,6 +432,8 @@ EOT
database_setup() { database_setup() {
log_inf "Database setup" log_inf "Database setup"
run_or_error "cp config/database.yml.example \"$D_DB_CONFIG_FILE\"" run_or_error "cp config/database.yml.example \"$D_DB_CONFIG_FILE\""
printf "\n"
database_question database_question
database_credentials database_credentials