From 3f8fbf093ce41587c516a82eb2d7aed4b1a6957c Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Tue, 6 Feb 2018 14:04:36 +0000
Subject: [PATCH] postgres query with output

---
 src/freedombone-app-pleroma      | 1 +
 src/freedombone-utils-postgresql | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/freedombone-app-pleroma b/src/freedombone-app-pleroma
index bddb2729..6d255052 100755
--- a/src/freedombone-app-pleroma
+++ b/src/freedombone-app-pleroma
@@ -140,6 +140,7 @@ function expire_pleroma_posts {
 
     pleroma_expire_script=/etc/cron.daily/pleroma-expire
     echo '#!/bin/bash' > $pleroma_expire_script
+    echo 'cd /etc/postgresql' >> $pleroma_expire_script
     echo "find /etc/pleroma/uploads/* -mtime +${expire_days_files} -exec rm -rf {} +" >> $pleroma_expire_script
     echo "$pleroma_expire_posts_script 2> /dev/null" >> $pleroma_expire_script
     chmod +x $pleroma_expire_script
diff --git a/src/freedombone-utils-postgresql b/src/freedombone-utils-postgresql
index 8c81a0fe..c41b6e31 100755
--- a/src/freedombone-utils-postgresql
+++ b/src/freedombone-utils-postgresql
@@ -145,10 +145,7 @@ function run_query_postgresql_with_output {
     database_name=$1
     database_query=$2
     cd /etc/postgresql
-    output=$(sudo -u postgres psql -d $database_name -c << EOF
-$database_query
-EOF
-)
+    output=$(sudo -u postgres psql -d $database_name -c "$database_query")
     echo "$output"
 }