From 900ddc0ed331af6429c3ed227559933a3976ed50 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 16 Mar 2019 15:39:58 +0100 Subject: [PATCH] fix package linter recommandations --- scripts/remove | 3 +-- scripts/restore | 12 ++++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/scripts/remove b/scripts/remove index 50479bb..e465098 100755 --- a/scripts/remove +++ b/scripts/remove @@ -55,8 +55,7 @@ ynh_remove_systemd_config #================================================= ynh_print_info "Removing the PostgreSQL database" -ynh_psql_execute_as_root "\connect $db_name -SELECT pg_terminate_backend (pg_stat_activity.pid) FROM pg_stat_activity WHERE pg_stat_activity.datname = '$db_name';" +ynh_psql_execute_as_root "SELECT pg_terminate_backend (pg_stat_activity.pid) FROM pg_stat_activity WHERE pg_stat_activity.datname = '$db_name';" # Remove a database if it exists, along with the associated user ynh_psql_remove_db "$db_name" "$db_name" diff --git a/scripts/restore b/scripts/restore index 97a8b4e..1a7a0ab 100755 --- a/scripts/restore +++ b/scripts/restore @@ -118,14 +118,10 @@ ynh_print_info "Restoring the PostgreSQL database..." ynh_psql_test_if_first_run ynh_psql_create_user "$app" "$db_pwd" -ynh_psql_execute_as_root \ -"CREATE DATABASE $db_name ENCODING 'UTF8' LC_COLLATE='C' LC_CTYPE='C' template=template0 OWNER $app;" -ynh_psql_execute_as_root "\connect $db_name -CREATE EXTENSION IF NOT EXISTS unaccent;" -ynh_psql_execute_as_root "\connect $db_name -CREATE EXTENSION IF NOT EXISTS pg_trgm;" -ynh_psql_execute_as_root "\connect $db_name -CREATE EXTENSION IF NOT EXISTS citext;" +ynh_psql_execute_as_root "CREATE DATABASE $db_name ENCODING 'UTF8' LC_COLLATE='C' LC_CTYPE='C' template=template0 OWNER $app;" +ynh_psql_execute_as_root "CREATE EXTENSION IF NOT EXISTS citext;" +ynh_psql_execute_as_root "CREATE EXTENSION IF NOT EXISTS pg_trgm;" +ynh_psql_execute_as_root "CREATE EXTENSION IF NOT EXISTS \"uuid-ossp\";" ynh_psql_execute_file_as_root ./db.sql "$db_name" #=================================================