From 4c30664a9b18fe32e7f70bedd1547500e5bee9e3 Mon Sep 17 00:00:00 2001 From: Dmytro Katyukha Date: Sun, 15 Sep 2024 20:59:16 +0300 Subject: [PATCH] [FIX] deployment command --- subpackages/lib/source/odood/lib/deploy/utils.d | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/subpackages/lib/source/odood/lib/deploy/utils.d b/subpackages/lib/source/odood/lib/deploy/utils.d index 638db77a..8a683ae3 100644 --- a/subpackages/lib/source/odood/lib/deploy/utils.d +++ b/subpackages/lib/source/odood/lib/deploy/utils.d @@ -1,9 +1,10 @@ module odood.lib.deploy.utils; -private import std.logger: infof; +private import std.logger: infof, tracef; private import std.format: format; private import std.exception: enforce, errnoEnforce; private import std.conv: to, text; +private import std.string: strip; private import core.sys.posix.unistd: geteuid, getegid; private import core.sys.posix.pwd: getpwnam_r, passwd; @@ -47,15 +48,15 @@ void createSystemUser(in Path home, in string name) { bool postgresCheckUserExists(in string username) { auto output = Process("psql") .setArgs([ - "-c", + "-t", "-A", "-c", i"SELECT count(*) FROM pg_user WHERE usename = '$(username)';".text, ]) .withUser("postgres") .execute .ensureOk(true) - .output; + .output.strip; - return output.to!int == 0; + return output.to!int != 0; } @@ -70,7 +71,7 @@ void postgresCreateUser(in string username, in string password) { ]) .withUser("postgres") .execute - .ensureStatus(true); + .ensureOk(true); infof("Postgresql user '%s' for Odoo created successfully.", username); }