diff --git a/qbittorrent/CHANGELOG.md b/qbittorrent/CHANGELOG.md index 220ce967c..0b1466e66 100644 --- a/qbittorrent/CHANGELOG.md +++ b/qbittorrent/CHANGELOG.md @@ -1,40 +1,51 @@ - ## 4.4.5-r3-ls229 (14-11-2022) + - Update to latest version from linuxserver/docker-qbittorrent ## 4.4.5-r2-ls227 (08-11-2022) + - Update to latest version from linuxserver/docker-qbittorrent ## 4.4.5-r2-ls226 (01-11-2022) + - Update to latest version from linuxserver/docker-qbittorrent ## 4.4.5-r2-ls224 (25-10-2022) + - Update to latest version from linuxserver/docker-qbittorrent ## 4.4.5-r1-ls223 (20-10-2022) + - Update to latest version from linuxserver/docker-qbittorrent ## 4.4.5-r0-ls222 (18-10-2022) + - Update to latest version from linuxserver/docker-qbittorrent ## 4.4.5-r0-ls221 (11-10-2022) + - Update to latest version from linuxserver/docker-qbittorrent ## 4.4.5-r0-ls219 (04-10-2022) + - Update to latest version from linuxserver/docker-qbittorrent ## 4.4.5-r0-ls218 (27-09-2022) + - Update to latest version from linuxserver/docker-qbittorrent ## 4.4.5-r0-ls217 (22-09-2022) + - Update to latest version from linuxserver/docker-qbittorrent ## 4.4.5-r0-ls216 (20-09-2022) + - Update to latest version from linuxserver/docker-qbittorrent ## 4.4.5-r0-ls215 (13-09-2022) + - Update to latest version from linuxserver/docker-qbittorrent -- Config folder moved to /config/addons_config/qBittorrent +- Config folder moved to /config/addons_config/qbittorrent ## 4.4.5-r0-ls214 (09-09-2022) diff --git a/qbittorrent/rootfs/etc/cont-init.d/00-folders.sh b/qbittorrent/rootfs/etc/cont-init.d/00-folders.sh index c73731f8c..4dcca2f4a 100644 --- a/qbittorrent/rootfs/etc/cont-init.d/00-folders.sh +++ b/qbittorrent/rootfs/etc/cont-init.d/00-folders.sh @@ -1,10 +1,9 @@ #!/bin/bash -mkdir -p /config/addons_config/qBittorrent +mkdir -p /config/addons_config/qbittorrent if [ -f /config/addons_config/qBittorrent/qBittorrent.conf ]; then echo "Migrating previous folder" - mkdir -p /config/addons_config/qbittorrent cp -prf /config/addons_config/qBittorrent/* /config/addons_config/qbittorrent/ rm -r /config/addons_config/qBittorrent echo "Files were moved to /config/addons_config/qbittorrent" > /config/addons_config/qBittorrent/filesmoved diff --git a/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh b/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh index 3b866b205..7e3132382 100644 --- a/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh +++ b/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh @@ -6,14 +6,14 @@ ########## # Define preferences line -mkdir -p /config/addons_config/qBittorrent +mkdir -p /config/addons_config/qbittorrent # copy default config -if [ ! -f /config/addons_config/qBittorrent/qBittorrent.conf ]; then - cp /defaults/qBittorrent.conf /config/addons_config/qBittorrent/qBittorrent.conf +if [ ! -f /config/addons_config/qbittorrent/qBittorrent.conf ]; then + cp /defaults/qBittorrent.conf /config/addons_config/qbittorrent/qBittorrent.conf fi -cd /config/addons_config/qBittorrent/ || true +cd /config/addons_config/qbittorrent/ || true LINE=$(sed -n '/Preferences/=' qBittorrent.conf) LINE=$((LINE + 1)) @@ -101,7 +101,7 @@ fi # WHITELIST # ################ -cd /config/addons_config/qBittorrent/ || true +cd /config/addons_config/qbittorrent/ || true if bashio::config.has_value 'whitelist'; then WHITELIST=$(bashio::config 'whitelist') #clean data @@ -115,7 +115,7 @@ fi # USERNAME # ############### -cd /config/addons_config/qBittorrent/ || true +cd /config/addons_config/qbittorrent/ || true if bashio::config.has_value 'Username'; then USERNAME=$(bashio::config 'Username') #clean data @@ -167,8 +167,8 @@ if bashio::config.has_value 'customUI' && [ ! "$CUSTOMUI" = default ] && [ ! "$C rm /webui/*.zip CUSTOMUIDIR="$(dirname "$(find /webui/"$CUSTOMUI" -iname "public" -type d)")" # Set qbittorrent - sed -i "$LINE i\WebUI\\\AlternativeUIEnabled=true" /config/addons_config/qBittorrent/qBittorrent.conf - sed -i "$LINE i\WebUI\\\RootFolder=$CUSTOMUIDIR" /config/addons_config/qBittorrent/qBittorrent.conf + sed -i "$LINE i\WebUI\\\AlternativeUIEnabled=true" /config/addons_config/qbittorrent/qBittorrent.conf + sed -i "$LINE i\WebUI\\\RootFolder=$CUSTOMUIDIR" /config/addons_config/qbittorrent/qBittorrent.conf # Set nginx #sed -i "s=/vuetorrent/public/=$CUSTOMUIDIR/public/=g" /etc/nginx/servers/ingress.conf #sed -i "s=vue.torrent=$CUSTOMUI.torrent=g" /etc/nginx/servers/ingress.conf @@ -180,4 +180,4 @@ fi ########## bashio::log.info "Default username/password : admin/adminadmin" -bashio::log.info "Configuration can be found in /config/addons_config/qBittorrent" +bashio::log.info "Configuration can be found in /config/addons_config/qbittorrent" diff --git a/qbittorrent/rootfs/etc/cont-init.d/93-openvpn.sh b/qbittorrent/rootfs/etc/cont-init.d/93-openvpn.sh index 63ef97ca9..244cd7aa3 100644 --- a/qbittorrent/rootfs/etc/cont-init.d/93-openvpn.sh +++ b/qbittorrent/rootfs/etc/cont-init.d/93-openvpn.sh @@ -6,7 +6,7 @@ declare openvpn_config declare openvpn_username declare openvpn_password -QBT_CONFIG_FILE="/config/addons_config/qBittorrent/qBittorrent.conf" +QBT_CONFIG_FILE="/config/addons_config/qbittorrent/qBittorrent.conf" if bashio::config.true 'openvpn_enabled'; then @@ -69,7 +69,7 @@ if bashio::config.true 'openvpn_enabled'; then echo "Using interface binding in the qBittorrent app" # Define preferences line - cd /config/addons_config/qBittorrent/ || exit 1 + cd /config/addons_config/qbittorrent/ || exit 1 LINE=$(sed -n '/Preferences/=' "$QBT_CONFIG_FILE") LINE=$((LINE + 1)) SESSION=$(sed -n '/BitTorrent/=' "$QBT_CONFIG_FILE")