YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix ynh_psql_user_exists

Browse source
This commit is contained in:
Kayou 2019-02-20 00:21:44 +01:00
parent b5ae91b34e
commit d5ca4dd88b
No known key found for this signature in database
GPG key ID: 823A2CBE071D3126
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/helpers.d/psql
View file

@ -120,7 +120,7 @@ ynh_psql_dump_db() {
ynh_psql_create_user() {
local user=$1
local psql=$2
ynh_psql_execute_as_root "CREATE USER $user WITH PASSWORD '$pwd'"
ynh_psql_execute_as_root --sql="CREATE USER $user WITH PASSWORD '$pwd'"
}
# Check if a psql user exists
@ -136,7 +136,7 @@ ynh_psql_user_exists()
# Manage arguments with getopts
ynh_handle_getopts_args "$@"
if [[ -z $(ynh_psql_execute_as_root --sql="SELECT 1 FROM pg_roles WHERE rolename='$user';") ]]
if [[ -n $(sudo --login --user=postgres PGUSER="postgres" PGPASSWORD="$(sudo cat $PSQL_ROOT_PWD_FILE)" psql -tAc "SELECT rolname FROM pg_roles WHERE rolname='$user';") ]]
then
return 1
else