Restore

qbittorrent/CHANGELOG.md

@@ -1,3 +1,15 @@
+### 4.6.0-3 (06-11-2023)
+- Minor bugs fixed
+- Ingress webui update at start
+
+### 4.6.0-2 (30-10-2023)
+- Minor bugs fixed
+
+### 4.6.0-WITHOUT_VPN (30-10-2023)
+- Minor bugs fixed
+
+## 4.6.0 (28-10-2023)
+- Update to latest version from linuxserver/docker-qbittorrent
 ### 4.5.5-4 (30-09-2023)
 - Minor bugs fixed
 - Avoid crash when using smbv1

qbittorrent/Dockerfile

@@ -16,7 +16,7 @@
 
 ARG BUILD_FROM
 ARG BUILD_VERSION
-ARG BUILD_UPSTREAM="4.5.5"
+ARG BUILD_UPSTREAM="4.6.0"
 FROM ${BUILD_FROM}
 
 ##################
@@ -58,9 +58,9 @@ RUN \
     && rm vuetorrent.zip >/dev/null
 
 # Global LSIO modifications
-ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
+ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
 ARG CONFIGLOCATION="/config/addons_config/qBittorrent"
-RUN if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
+RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
 
 ##################
 # 3 Install apps #
@@ -72,8 +72,8 @@ COPY rootfs/ /
 ARG MODULES="00-banner.sh 01-custom_script.sh 00-local_mounts.sh 00-smb_mounts.sh 90-dns_set.sh"
 
 # Automatic modules download
-ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_automodules.sh" "/ha_automodules.sh"
-RUN /ha_automodules.sh "$MODULES" && rm /ha_automodules.sh
+ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_automodules.sh" "/ha_automodules.sh"
+RUN chmod 744 /ha_automodules.sh && /ha_automodules.sh "$MODULES" && rm /ha_automodules.sh
 
 #RUN if [ -f /etc/s6-overlay/s6-rc.d/init-adduser ]; then for SCRIPTS in /etc/cont-init.d/*; do [ -e "$SCRIPTS" ] || continue \
 #    && mkdir -p /abscripts && sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS" \
@@ -85,8 +85,8 @@ RUN /ha_automodules.sh "$MODULES" && rm /ha_automodules.sh
 ARG PACKAGES=""
 
 # Automatic apps & bashio
-ADD --chmod=744 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_autoapps.sh" "/ha_autoapps.sh"
-RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh
+ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_autoapps.sh" "/ha_autoapps.sh"
+RUN chmod 744 /ha_autoapps.sh && /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh
 
 # Switch scripts from s6 v2 to v3
 #RUN if [ -f /etc/s6-overlay/s6-rc.d/init-custom-file/run ]; then mkdir "/custom-cont-init.d" && for SCRIPTS in /etc/cont-init.d/*; do [ -e "$SCRIPTS" ] || continue \
@@ -98,11 +98,11 @@ RUN /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh
 
 # Add entrypoint
 ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
-ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
+ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
 
 # Entrypoint modifications
-ADD --chmod=777 "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint_modif.sh" "/ha_entrypoint_modif.sh"
-RUN /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh
+ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint_modif.sh" "/ha_entrypoint_modif.sh"
+RUN chmod 777 /ha_entrypoint.sh /ha_entrypoint_modif.sh && /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh
 
 ############
 # 5 Labels #

qbittorrent/config.json

@@ -135,5 +135,5 @@
   "slug": "qbittorrent",
   "udev": true,
   "url": "https://github.com/alexbelgium/hassio-addons",
-  "version": "4.5.5-4"
+  "version": "4.6.0-3"
 }

qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh

@@ -152,6 +152,11 @@ if [ ! "$CUSTOMUI" = custom ]; then
     chown "$PUID:$PGID" /webui
 fi
 
+# Update ingress webui
+curl -f -s -S -O -J -L "$(curl -f -s https://api.github.com/repos/WDaan/VueTorrent/releases | grep -o "http.*vuetorrent.zip" | head -1)" >/dev/null
+unzip -o vuetorrent.zip -d / >/dev/null
+rm vuetorrent.zip
+
 # Install webui
 if bashio::config.has_value 'customUI' && [ ! "$CUSTOMUI" = default ] && [ ! "$CUSTOMUI" = custom ]; then
     ### Variables

qbittorrent/rootfs/etc/cont-init.d/93-openvpn.sh

@@ -71,9 +71,9 @@ if bashio::config.true 'openvpn_enabled'; then
 
     # Define preferences line
     cd /config/addons_config/qBittorrent/ || exit 1
-    LINE=$(sed -n '/Preferences/=' "$QBT_CONFIG_FILE")
+    LINE=$(sed -n '/\[Preferences\]/=' "$QBT_CONFIG_FILE")
     LINE=$((LINE + 1))
-    SESSION=$(sed -n '/BitTorrent/=' "$QBT_CONFIG_FILE")
+    SESSION=$(sed -n '/\[BitTorrent\]/=' "$QBT_CONFIG_FILE")
 
     # If qBittorrent.conf exists
     if [ -f "$QBT_CONFIG_FILE" ]; then

qbittorrent/updater.json

@@ -1,9 +1,9 @@
 {
   "github_fulltag": "false",
-  "last_update": "02-09-2023",
+  "last_update": "28-10-2023",
   "repository": "alexbelgium/hassio-addons",
   "slug": "qbittorrent",
   "source": "github",
   "upstream_repo": "linuxserver/docker-qbittorrent",
-  "upstream_version": "4.5.5"
+  "upstream_version": "4.6.0"
 }