Browse Source

postgres query with output

Bob Mottram 7 years ago
parent
commit
3f8fbf093c
2 changed files with 2 additions and 4 deletions
  1. 1
    0
      src/freedombone-app-pleroma
  2. 1
    4
      src/freedombone-utils-postgresql

+ 1
- 0
src/freedombone-app-pleroma View File

140
 
140
 
141
     pleroma_expire_script=/etc/cron.daily/pleroma-expire
141
     pleroma_expire_script=/etc/cron.daily/pleroma-expire
142
     echo '#!/bin/bash' > $pleroma_expire_script
142
     echo '#!/bin/bash' > $pleroma_expire_script
143
+    echo 'cd /etc/postgresql' >> $pleroma_expire_script
143
     echo "find /etc/pleroma/uploads/* -mtime +${expire_days_files} -exec rm -rf {} +" >> $pleroma_expire_script
144
     echo "find /etc/pleroma/uploads/* -mtime +${expire_days_files} -exec rm -rf {} +" >> $pleroma_expire_script
144
     echo "$pleroma_expire_posts_script 2> /dev/null" >> $pleroma_expire_script
145
     echo "$pleroma_expire_posts_script 2> /dev/null" >> $pleroma_expire_script
145
     chmod +x $pleroma_expire_script
146
     chmod +x $pleroma_expire_script

+ 1
- 4
src/freedombone-utils-postgresql View File

145
     database_name=$1
145
     database_name=$1
146
     database_query=$2
146
     database_query=$2
147
     cd /etc/postgresql
147
     cd /etc/postgresql
148
-    output=$(sudo -u postgres psql -d $database_name -c << EOF
149
-$database_query
150
-EOF
151
-)
148
+    output=$(sudo -u postgres psql -d $database_name -c "$database_query")
152
     echo "$output"
149
     echo "$output"
153
 }
150
 }
154
 
151