th3r00t/pyShelf
1
0
Fork 0
mirror of https://github.com/th3r00t/pyShelf.git synced 2026-04-28 01:59:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixed getting of user answers for db creation?

Browse Source
This commit is contained in:
Raelon Masters
2020-07-14 16:46:13 -04:00
parent 4079e04d9b
commit b733eb9122
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
installer vendored
View File

@@ -304,8 +304,8 @@ if RequiredServices().db_server_found(req) is False:
if r["name"] == "PASSWORD": if r["name"] == "PASSWORD":
sql_pass = r["answer"] sql_pass = r["answer"]
# sql_user = config["USER"] sql_user = config["USER"]
sql_user = "pyshelf" # sql_user = "pyshelf"
db_name = "pyshelf" db_name = "pyshelf"
psql_cmd = ( psql_cmd = (
"CREATE DATABASE %s; CREATE USER %s WITH PASSWORD '%s'; \ "CREATE DATABASE %s; CREATE USER %s WITH PASSWORD '%s'; \
@@ -333,6 +333,11 @@ if RequiredServices().db_server_found(req) is False:
psql_cmd, psql_cmd,
] ]
else: else:
for r in install_answers:
if r["name"] == "PASSWORD":
sql_pass = r["answer"]
sql_user = config["USER"]
db_name = "pyshelf"
psql_cmd = ( psql_cmd = (
"CREATE DATABASE %s; CREATE USER %s WITH PASSWORD '%s'; \ "CREATE DATABASE %s; CREATE USER %s WITH PASSWORD '%s'; \
GRANT ALL PRIVILEGES ON DATABASE %s TO %s;" GRANT ALL PRIVILEGES ON DATABASE %s TO %s;"