Skip to content
Browse files

Merge branch 'master' of https://github.com/sfawaz/diaspora into sed-fix

  • Loading branch information...
2 parents 311e20b + 7844264 commit 3d7f64123946baa3141ea1a91f3d2f3dfbe25e52 @Raven24 Raven24 committed
Showing with 5 additions and 5 deletions.
  1. +5 −5 script/install.sh
View
10 script/install.sh
@@ -317,8 +317,8 @@ database_question() {
PgSQL )
D_DB="postgres"
# replace default with postgres
- run_or_error "sed -i'' -r 's/(<<: \*mysql)/#\1/g' \"$D_DB_CONFIG_FILE\""
- run_or_error "sed -i'' -r 's/(#(<<: \*postgres))/\2/g' \"$D_DB_CONFIG_FILE\""
+ run_or_error "sed -i'' -r 's/\(<<: \*mysql\)/#\1/g' \"$D_DB_CONFIG_FILE\""
+ run_or_error "sed -i'' -r 's/\(#\(<<: \*postgres\)\)/\2/g' \"$D_DB_CONFIG_FILE\""
break
;;
esac
@@ -331,9 +331,9 @@ database_credentials() {
read -e -p "username: " D_DB_USER
read -e -p "password: " D_DB_PASS
- run_or_error "sed -i'' -r \"s/(host:)[^\n]*/\1 $D_DB_HOST/g\" \"$D_DB_CONFIG_FILE\""
- run_or_error "sed -i'' -r \"s/(username:)[^\n]*/\1 $D_DB_USER/g\" \"$D_DB_CONFIG_FILE\""
- run_or_error "sed -i'' -r \"s/(password:)[^\n]*/\1 $D_DB_PASS/g\" \"$D_DB_CONFIG_FILE\""
+ run_or_error "sed -i'' -r \"s/\(host:\)[^\n]*/\1 $D_DB_HOST/g\" \"$D_DB_CONFIG_FILE\""
+ run_or_error "sed -i'' -r \"s/\(username:\)[^\n]*/\1 $D_DB_USER/g\" \"$D_DB_CONFIG_FILE\""
+ run_or_error "sed -i'' -r \"s/\(password:\)[^\n]*/\1 $D_DB_PASS/g\" \"$D_DB_CONFIG_FILE\""
}
# setup database

0 comments on commit 3d7f641

Please sign in to comment.
Something went wrong with that request. Please try again.