Преглед на файлове

Merge branch 'stretch' of https://github.com/bashrc/freedombone

Bob Mottram преди 7 години
родител
ревизия
5f0f543008
променени са 1 файла, в които са добавени 5 реда и са изтрити 4 реда
  1. 5
    4
      src/freedombone-app-pleroma

+ 5
- 4
src/freedombone-app-pleroma Целия файл

165
     chmod +x $pleroma_expire_posts_script
165
     chmod +x $pleroma_expire_posts_script
166
 
166
 
167
     pleroma_expire_script=/etc/cron.daily/pleroma-expire
167
     pleroma_expire_script=/etc/cron.daily/pleroma-expire
168
+    expire_days_files_threshold=$(($expire_days_files - 1))
168
     echo '#!/bin/bash' > $pleroma_expire_script
169
     echo '#!/bin/bash' > $pleroma_expire_script
169
     echo 'cd /etc/postgresql' >> $pleroma_expire_script
170
     echo 'cd /etc/postgresql' >> $pleroma_expire_script
170
     echo 'if [ -d /etc/pleroma/tempfiles ]; then' >> $pleroma_expire_script
171
     echo 'if [ -d /etc/pleroma/tempfiles ]; then' >> $pleroma_expire_script
187
     echo '            nowdate=$(date +%s)' >> $pleroma_expire_script
188
     echo '            nowdate=$(date +%s)' >> $pleroma_expire_script
188
     echo '            sinceepoch=$(date +%s -r $imagefile)' >> $pleroma_expire_script
189
     echo '            sinceepoch=$(date +%s -r $imagefile)' >> $pleroma_expire_script
189
     echo '            daysold=$((($nowdate - $sinceepoch) / 86400))' >> $pleroma_expire_script
190
     echo '            daysold=$((($nowdate - $sinceepoch) / 86400))' >> $pleroma_expire_script
190
-    echo "            if [ \$daysold -ge ${expire_days_files} ]; then" >> $pleroma_expire_script
191
-    echo '                if [ ! -d /etc/pleroma/tempfiles/$imagedir ]; then' >> $pleroma_expire_script
192
-    echo '                    mkdir /etc/pleroma/tempfiles/$imagedir' >> $pleroma_expire_script
191
+    echo "            if [ \$daysold -ge ${expire_days_files_threshold} ]; then" >> $pleroma_expire_script
192
+    echo '                if [ ! -d $imagedir ]; then' >> $pleroma_expire_script
193
+    echo '                    mkdir $imagedir' >> $pleroma_expire_script
193
     echo '                fi' >> $pleroma_expire_script
194
     echo '                fi' >> $pleroma_expire_script
194
-    echo '                cp -rp $imagefile /etc/pleroma/tempfiles/$imagedir' >> $pleroma_expire_script
195
+    echo '                cp -rp $imagefile $imagedir' >> $pleroma_expire_script
195
     echo '            fi' >> $pleroma_expire_script
196
     echo '            fi' >> $pleroma_expire_script
196
     echo '        fi' >> $pleroma_expire_script
197
     echo '        fi' >> $pleroma_expire_script
197
     echo '    fi' >> $pleroma_expire_script
198
     echo '    fi' >> $pleroma_expire_script