From 2e8fab6bf90c8bd1f39f7e45f1ee9a3c51b0b392 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Thu, 30 Jan 2014 17:52:26 +0100 Subject: [PATCH] Capture the full DB / user name --- files/gitlab-cookbooks/gitlab/libraries/helper.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/files/gitlab-cookbooks/gitlab/libraries/helper.rb b/files/gitlab-cookbooks/gitlab/libraries/helper.rb index e0fd9aa..7681da1 100644 --- a/files/gitlab-cookbooks/gitlab/libraries/helper.rb +++ b/files/gitlab-cookbooks/gitlab/libraries/helper.rb @@ -30,8 +30,8 @@ class PgHelper def database_exists?(db_name) psql_cmd(["-d 'template1'", - "-c 'select datname from pg_database' -x", - "| grep #{db_name}"]) + "-c 'select datname from pg_database' -A", + "| grep -x #{db_name}"]) end def sql_user_exists? @@ -44,8 +44,8 @@ class PgHelper def user_exists?(db_user) psql_cmd(["-d 'template1'", - "-c 'select usename from pg_user' -x", - "|grep #{db_user}"]) + "-c 'select usename from pg_user' -A", + "|grep -x #{db_user}"]) end def psql_cmd(cmd_list) -- libgit2 0.21.2