From a386a710b7563c3e10a13bc03591e72e9e24a7b3 Mon Sep 17 00:00:00 2001
From: Norbert Varzariu <loomsen@gmail.com>
Date: Tue, 26 Jan 2016 08:29:42 +0100
Subject: [PATCH] quote psql password in scripts

---
 templates/mysql.sh.erb | 1 -
 templates/psql.sh.erb  | 6 ++----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/templates/mysql.sh.erb b/templates/mysql.sh.erb
index 4a81e20..210e51f 100644
--- a/templates/mysql.sh.erb
+++ b/templates/mysql.sh.erb
@@ -5,7 +5,6 @@
 #
 host=<%=@host%>
 user=<%=@dbbackup_user%>
-pass=<%=@dbbackup_password%>
 
 <% if (@dbbackup_user == 'root' && @dbbackup_password == '') -%>
 dbs=( 
diff --git a/templates/psql.sh.erb b/templates/psql.sh.erb
index 77fdd15..2542272 100644
--- a/templates/psql.sh.erb
+++ b/templates/psql.sh.erb
@@ -5,14 +5,12 @@
 #
 host=<%=@host%>
 user=<%=@dbbackup_user%>
-pass=<%=@dbbackup_password%>
 
-#PGPASSWORD="$pass"
 dbs=( 
-      $(ssh -l <%=@backup_user-%> "$host" "PGPASSWORD=${pass} psql -U ${user} -Atc \"SELECT datname FROM pg_database WHERE NOT datistemplate AND NOT datname ~ '<%@ignore_dbs.each do |db|-%><%if db == @ignore_dbs.last-%><%=db-%><%else-%><%=db-%>|<%end-%><%end-%>'\"")  
+      $(ssh -l <%=@backup_user-%> "$host" "PGPASSWORD='<%=@dbbackup_password%>' psql -U ${user} -Atc \"SELECT datname FROM pg_database WHERE NOT datistemplate AND NOT datname ~ '<%@ignore_dbs.each do |db|-%><%if db == @ignore_dbs.last-%><%=db-%><%else-%><%=db-%>|<%end-%><%end-%>'\"")  
     )
 for db in "${dbs[@]}"; do
-  ssh -l <%=@backup_user-%> "$host" "PGPASSWORD=${pass} <%=@dumper-%> -U ${user} <%=@dump_flags-%> ${db}" > "$db".sql
+  ssh -l <%=@backup_user-%> "$host" "PGPASSWORD='<%=@dbbackup_password%>' <%=@dumper-%> -U ${user} <%=@dump_flags-%> ${db}" > "$db".sql
   wait
 <% if @compress != '' -%>
   <%=@compress-%> "$db".sql