hopefully fix restore again

Dockerfile

@@ -39,12 +39,12 @@ ENV RUN_MIGRATIONS=0
 ENV CREATE_ADMIN=0
 
 COPY --from=builder /pause/pauser /pauser
+COPY backup.sh /
+COPY restore.sh /
 
 USER root
 ### CRON BACKUPS
 RUN true \
-   && echo 'b=$(date +%Y%m%d%H%M%S); mkdir -p /mnt/save/$b; pg_dump $DATABASE_URL --clean > /mnt/save/$b/pg.dump || (rm -rf /mnt/save/$b; echo "backup failed; deleting $b"; exit 1); exit $?' > /backup.sh \
-   && echo 'b=$(find /mnt/save -type f | sort | tail -n 1); if [ -n "$b" ]; then echo restoring $b; psql $DATABASE_URL < "$b"; fi && service postgresql start;' > /restore.sh \
    && echo '0 4,8,12,16,20 * * * bash /backup.sh >> /var/log/cronj.log 2>&1' > /etc/cron.d/backups \
    && echo '' >> /etc/cron.d/backups \
    && chmod 0644 /etc/cron.d/backups \

backup.sh

@@ -0,0 +1,12 @@
+b=$(date +%Y%m%d%H%M%S)
+mkdir -p /mnt/save/$b
+pg_dump $DATABASE_URL --clean > /mnt/save/$b/pg.dump \
+   || ( 
+      rm -rf /mnt/save/$b
+      echo "backup failed; deleting $b"
+      exit 1
+   )
+if du -sh /mnt/save/$b | grep -Ei "^[ ]*(4|2.).0K"; then 
+   rm -rf /mnt/save/$b
+   echo rm empty backup $b
+fi

restore.sh

@@ -0,0 +1,17 @@
+for b in $(find /mnt/save -not -path '*/\.*' -type f | sort -r); do
+   if [ -n "$b" ]; then
+      du -sh "$b"
+      if ! du -sh "$b" | grep -Ei "^[ \t]*[0-9][0-9]?(.0)?[mg]"; then
+         echo would rm empty backup $b >&2
+         set -x
+         mv "$b" "${b%/*}/.${b##*/}"
+         set +x
+         continue
+      fi
+      echo restoring $b >&2
+      if psql $DATABASE_URL < "$b"; then
+         break
+      fi
+   fi
+done
+service postgresql start