diff --git a/setup-prod.bash b/setup-prod.bash index 7abbe65..9de2981 100755 --- a/setup-prod.bash +++ b/setup-prod.bash @@ -111,11 +111,14 @@ function create_user { chown -R $PROJECT_NAME:$PROJECT_NAME /etc/$PROJECT_NAME } +function normalize_project_name { + echo "$1" | sed 's/-//g' +} + function set_project_name { [[ -z ${REPO_NAME:-} ]] && REPO_NAME=$(echo $REPO_URL | rev | cut -d/ -f1 | rev |cut -d. -f1) # get last url part minus '.git' - DB_USER=$REPO_NAME - [[ -z ${PROJECT_NAME:-} ]] && PROJECT_NAME=$REPO_NAME - true + DB_USER=$(normalize_project_name $REPO_NAME) + [[ -z ${PROJECT_NAME:-} ]] && PROJECT_NAME=$DB_USER || true } function define_rails_app { @@ -266,6 +269,9 @@ parse_options $* set -Eue +normalize_project_name 'qui-suis-je' +exit 0 + assert_repo_url set_project_name install_pacapt