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

Remove some $() and []

Browse source
This commit is contained in:
Kayou 2019-02-20 23:58:26 +01:00
parent f0d8f88121
commit 3ae5955590
No known key found for this signature in database
GPG key ID: 823A2CBE071D3126
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
data/helpers.d/psql
View file

@ -200,8 +200,8 @@ ynh_psql_setup_db() {
# If $db_pwd is not given, use new_db_pwd instead for db_pwd # If $db_pwd is not given, use new_db_pwd instead for db_pwd
db_pwd="${db_pwd:-$new_db_pwd}" db_pwd="${db_pwd:-$new_db_pwd}"
if [ $(ynh_psql_user_exists --user=$db_user) ]; then if ! ynh_psql_user_exists --user=$db_user; then
ynh_psql_create_user "$db_name" "$db_user" "$db_pwd" ynh_psql_create_user "$db_user" "$db_pwd"
fi fi
ynh_psql_create_db "$db_name" "$db_user" "$db_pwd" # Create the database ynh_psql_create_db "$db_name" "$db_user" "$db_pwd" # Create the database
@ -223,7 +223,7 @@ ynh_psql_remove_db() {
ynh_handle_getopts_args "$@" ynh_handle_getopts_args "$@"
local psql_root_password=$(sudo cat $PSQL_ROOT_PWD_FILE) local psql_root_password=$(sudo cat $PSQL_ROOT_PWD_FILE)
if $(ynh_psql_database_exists "$db_name"); then # Check if the database exists if ynh_psql_database_exists --database=$db_name; then # Check if the database exists
echo "Removing database $db_name" >&2 echo "Removing database $db_name" >&2
ynh_psql_drop_db $db_name # Remove the database ynh_psql_drop_db $db_name # Remove the database
else else
@ -231,7 +231,7 @@ ynh_psql_remove_db() {
fi fi
# Remove psql user if it exists # Remove psql user if it exists
if $(ynh_psql_user_exists --user=$db_user); then if ynh_psql_user_exists --user=$db_user; then
echo "Removing user $db_user" >&2 echo "Removing user $db_user" >&2
ynh_psql_drop_user $db_user ynh_psql_drop_user $db_user
else else