From 7c0eb4e6761f5a48d8ce88facd24e2ed4c16f246 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Wed, 23 Feb 2022 22:17:26 +0000 Subject: [PATCH] Fix formatting, restore 4.3.3 migration check. --- root/etc/cont-init.d/30-config | 17 ++++++++++++----- root/etc/services.d/qbittorrent/run | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/root/etc/cont-init.d/30-config b/root/etc/cont-init.d/30-config index 40f6d81..3c9bc24 100644 --- a/root/etc/cont-init.d/30-config +++ b/root/etc/cont-init.d/30-config @@ -5,15 +5,22 @@ mkdir -p /config/qBittorrent # copy config [[ ! -e /config/qBittorrent/qBittorrent.conf ]] && \ - cp /defaults/qBittorrent.conf /config/qBittorrent/qBittorrent.conf + cp /defaults/qBittorrent.conf /config/qBittorrent/qBittorrent.conf + +# v4.3.3 BT_backup migration +[[ -d /config/data/qBittorrent/BT_backup/ ]] && \ + mv /config/qBittorrent/BT_backup/ /config/qBittorrent/BT_backup.bak/ && \ + mkdir /config/qBittorrent/BT_backup/ && \ + cp -a /config/data/qBittorrent/BT_backup/. /config/qBittorrent/BT_backup/ && \ + mv /config/data/qBittorrent/BT_backup/ /config/data/qBittorrent/BT_backup.old/ # chown download directory if currently not set to abc if [[ -d /downloads ]]; then - if [[ "$(stat -c '%U' /downloads)" != "abc" ]]; then - chown -R abc:abc /downloads - fi + if [[ "$(stat -c '%U' /downloads)" != "abc" ]]; then + chown -R abc:abc /downloads + fi fi # permissions chown -R abc:abc \ - /config + /config diff --git a/root/etc/services.d/qbittorrent/run b/root/etc/services.d/qbittorrent/run index 71651a0..4d19e8f 100644 --- a/root/etc/services.d/qbittorrent/run +++ b/root/etc/services.d/qbittorrent/run @@ -3,4 +3,4 @@ WEBUI_PORT=${WEBUI_PORT:-8080} exec \ - s6-setuidgid abc /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}" + s6-setuidgid abc /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}"