qBittorrent:4.4.3 qee:4.4.3.11

.github/workflows/qBittorrent-Tags-buildx.yml

@@ -7,8 +7,8 @@ on:
   workflow_dispatch:
 
 env:
-  QBITTORRENT_VER: 4.4.2
-  QBITTORRENT_EE_VER: 4.4.2.10
+  QBITTORRENT_VER: 4.4.3
+  QBITTORRENT_EE_VER: 4.4.3.11
 
 jobs:
   job1:

qBittorrent/Dockerfile

@@ -1,16 +1,18 @@
 #compiling qB
 FROM alpine:3.15 as compilingqB
 
-ARG LIBTORRENT_VER=2.0.5
-ARG QBITTORRENT_VER=4.4.2
-ARG QBITTORRENT_EE_VER=4.4.2.10
+ARG LIBTORRENT_VER=2.0.6
+ARG QBITTORRENT_VER=4.4.3
+ARG QBITTORRENT_EE_VER=4.4.3.11
 
 RUN apk add --no-cache ca-certificates cmake build-base boost-dev python3-dev \
          py3-setuptools samurai qt6-qttools-dev libexecinfo-dev \
 #libtorrent-rasterbar
 && mkdir /qbbuild \
 && wget -P /qbbuild https://github.com/arvidn/libtorrent/releases/download/v${LIBTORRENT_VER}/libtorrent-rasterbar-${LIBTORRENT_VER}.tar.gz \
-&& tar -zxvf /qbbuild/libtorrent-rasterbar-${LIBTORRENT_VER}.tar.gz -C /qbbuild \
+&& tar -zxf /qbbuild/libtorrent-rasterbar-${LIBTORRENT_VER}.tar.gz -C /qbbuild \
+# fix armv7 build
+&& wget -O /qbbuild/libtorrent-rasterbar-${LIBTORRENT_VER}/test/test_copy_file.cpp https://raw.githubusercontent.com/arvidn/libtorrent/fac8d18e72cdd16a56a34dd805df9fefe46d8f0a/test/test_copy_file.cpp \
 && cd /qbbuild/libtorrent-rasterbar-${LIBTORRENT_VER} \
 && cmake -B build -DCMAKE_BUILD_TYPE=None -DCMAKE_CXX_STANDARD=17 -DCMAKE_VERBOSE_MAKEFILE=ON \
          -DCMAKE_INSTALL_PREFIX=/usr -Dbuild_tests=ON -Dpython-bindings=ON -Dpython-egg-info=ON \

qBittorrent/README.md

@@ -10,7 +10,7 @@
 
 |名称|版本|说明|
 |:-|:-|:-|
-|qBittorrent-qBittorrentEE|4.4.2-4.4.2.10|(amd64;arm64v8;arm32v7) 集成Trackers自动更新|
+|qBittorrent-qBittorrentEE|4.4.3-4.4.3.11|(amd64;arm64v8;arm32v7) 集成Trackers自动更新|
 
 #### 版本升级注意：
 

qBittorrent/root/etc/cont-init.d/qBittorrent.sh

@@ -5,26 +5,26 @@ if [ ! -d /config/qBittorrent/config ]; then
   mkdir -p /config/qBittorrent/config
 fi
 if [ ! -e /config/qBittorrent/config/qBittorrent.conf ]; then
-cp /usr/local/qbittorrent/defaults/qBittorrent.conf /config/qBittorrent/config/qBittorrent.conf
+  cp /usr/local/qbittorrent/defaults/qBittorrent.conf /config/qBittorrent/config/qBittorrent.conf
 fi
 
 #检查Search文件，并创建.
 if [ ! -d /config/qBittorrent/data/nova3/engines ]; then
-mkdir -p /config/qBittorrent/data/nova3/engines
+  mkdir -p /config/qBittorrent/data/nova3/engines
 fi
 cp -ru /usr/local/qbittorrent/defaults/Search/* /config/qBittorrent/data/nova3/engines
 
 #设定trackers更新任务
 if [ `grep  -c updatetrackers.sh /var/spool/cron/crontabs/root` -eq 0 ]; then
-echo "0       0       *       *       *       /usr/local/qbittorrent/updatetrackers.sh" >> /var/spool/cron/crontabs/root
-echo trackers更新任务已设定。
+  echo "0       0       *       *       *       /usr/local/qbittorrent/updatetrackers.sh" >> /var/spool/cron/crontabs/root
+  echo trackers更新任务已设定。
 else
-echo trackers更新任务已存在。
+  echo trackers更新任务已存在。
 fi
 
 #启动时更新trackers。
 if [ "$QB_TRACKERS_UPDATE_AUTO" == "true" ]; then
-/usr/local/qbittorrent/updatetrackers.sh
+  /usr/local/qbittorrent/updatetrackers.sh
 fi
 
 #设置时区

qBittorrent/root/usr/local/qbittorrent/updatetrackers.sh

@@ -13,7 +13,9 @@ if [ "$QB_TRACKERS_UPDATE_AUTO" == "true" ]; then
       sed -i '1,/^Session\\AdditionalTrackers=.*/{//d;}' /config/qBittorrent/config/qBittorrent.conf
       chown qbittorrent:qbittorrent /config/qBittorrent/config/qBittorrent.conf
       #kill qBittorrent
-      ps -ef |grep profile |grep -v grep|awk '{print $1}'|xargs kill -9
+      if [ `ps -ef |grep profile |grep -v grep |wc -l` -ne 0 ]; then
+        ps -ef |grep profile |grep -v grep |awk '{print $1}'|xargs kill -9
+      fi
       echo 已更新trackers。
     fi
     rm /tmp/trackers_all.txt /tmp/Newtrackers.txt