From f2dda0d07aa879993fb7b64df5da2adff0dee979 Mon Sep 17 00:00:00 2001 From: Renat Gabdulhakov Date: Thu, 11 Jan 2024 23:47:45 -0600 Subject: [PATCH 1/4] Update 91-qbittorrent_configuration.sh Fix qBittorrent WebUI --- .../rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0a41a3b4d..e374b391d 100755 --- a/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh +++ b/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh @@ -190,7 +190,7 @@ if [ "$CUSTOMUI" = default ]; then sed -i '/AlternativeUIEnabled/d' qBittorrent.conf sed -i '/RootFolder/d' qBittorrent.conf # 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 + curl -f -s -S -O -J -L "$(curl -f -s -L 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 fi From 7cba39a9edc9b334aa030ca441e8c3ebb5e4e0c0 Mon Sep 17 00:00:00 2001 From: Renat Gabdulhakov Date: Thu, 11 Jan 2024 23:57:33 -0600 Subject: [PATCH 2/4] Update 91-qbittorrent_configuration.sh Use redirection for all curl calls --- .../rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 e374b391d..277dcb06b 100755 --- a/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh +++ b/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh @@ -203,18 +203,18 @@ if bashio::config.has_value 'customUI' && [ ! "$CUSTOMUI" = default ] && [ ! "$C ### Download WebUI case $CUSTOMUI in "vuetorrent") - curl -f -s -S -J -L -o /webui/release.zip "$(curl -f -s https://api.github.com/repos/WDaan/VueTorrent/releases/latest | grep -o "http.*vuetorrent.zip" | head -1)" >/dev/null + curl -f -s -S -J -L -o /webui/release.zip "$(curl -f -s -L https://api.github.com/repos/WDaan/VueTorrent/releases/latest | grep -o "http.*vuetorrent.zip" | head -1)" >/dev/null ;; "qbit-matUI") - curl -f -s -S -J -L -o /webui/release.zip "$(curl -f -s https://api.github.com/repos/bill-ahmed/qbit-matUI/releases/latest | grep -o "http.*Unix.*.zip" | head -1)" >/dev/null + curl -f -s -S -J -L -o /webui/release.zip "$(curl -f -s -L https://api.github.com/repos/bill-ahmed/qbit-matUI/releases/latest | grep -o "http.*Unix.*.zip" | head -1)" >/dev/null echo "" bashio::log.warning "qbit-matUI selected ! It will not work for ingress, which will stay with vuetorrent" echo "" ;; "qb-web") - curl -f -s -S -J -L -o /webui/release.zip "$(curl -f -s https://api.github.com/repos/CzBiX/qb-web/releases | grep -o "http.*qb-web-.*zip" | head -1)" >/dev/null + curl -f -s -S -J -L -o /webui/release.zip "$(curl -f -s -L https://api.github.com/repos/CzBiX/qb-web/releases | grep -o "http.*qb-web-.*zip" | head -1)" >/dev/null ;; esac From 841ad14fed65f557be63b5d846f41d12bb4042ce Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Fri, 12 Jan 2024 08:49:57 +0100 Subject: [PATCH 3/4] Add informative message if failure to download webui --- .../rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 277dcb06b..0f3ac46eb 100755 --- a/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh +++ b/qbittorrent/rootfs/etc/cont-init.d/91-qbittorrent_configuration.sh @@ -217,7 +217,7 @@ if bashio::config.has_value 'customUI' && [ ! "$CUSTOMUI" = default ] && [ ! "$C curl -f -s -S -J -L -o /webui/release.zip "$(curl -f -s -L https://api.github.com/repos/CzBiX/qb-web/releases | grep -o "http.*qb-web-.*zip" | head -1)" >/dev/null ;; - esac + esac || { bashio::log.warning "$CUSTOMUI could not be downloaded, please raise an issue on the github repository. The default UI will be used" && exit 0 ; } ### Install WebUI mkdir -p /webui/"$CUSTOMUI" From f8fb098a836cc762026ed4de9d6c6077e2c49dc3 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Fri, 12 Jan 2024 08:52:43 +0100 Subject: [PATCH 4/4] Update CHANGELOG.md --- qbittorrent/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/qbittorrent/CHANGELOG.md b/qbittorrent/CHANGELOG.md index 5fbc54115..17b4b402b 100644 --- a/qbittorrent/CHANGELOG.md +++ b/qbittorrent/CHANGELOG.md @@ -1,3 +1,4 @@ +- Fix : failure to install custom webUI https://github.com/alexbelgium/hassio-addons/issues/1172 (thanks @akrigator) - [qbit_manage] : switch to develop ### 4.6.2_40 (31-12-2023)