diff --git a/defaults.inc b/defaults.inc index f532ae3..b2e4d34 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='3.8.210-05022023' +VERS='3.8.211-05022023' MMFOLDER="/opt/idssys/mediamanager" TMPFOLDER="${MMFOLDER}/.tmp" @@ -8,7 +8,7 @@ TMPFOLDER="${MMFOLDER}/.tmp" MMSRV=$(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) AVAILSERVICES=bazarr,jackett,lidarr,ombi,qbittorrent,radarr,radarr3d,sonarr,snap.tautulli.tautulli -UPDATESERVICES=bazarr,jackett,lidarr,ombi,organizr,radarr,sonarr +UPDATESERVICES=bazarr,jackett,lidarr,ombi,organizr,qbittorrent,radarr,sonarr BETA_SERVICES=" " IFS=, @@ -73,6 +73,7 @@ MM_UPDATE_REPO['lidarr']='lidarr' MM_UPDATE_REPO['jackett']='jackett' MM_UPDATE_REPO['bazarr']='morpheus65535' MM_UPDATE_REPO['organizr']='git' +MM_UPDATE_REPO['qbittorrent']='systemd' declare -A MM_UPDATE_REPO_GREP MM_UPDATE_REPO_GREP['ombi']='linux-x64' diff --git a/mm-scripts.sh b/mm-scripts.sh index 1047e2f..ce3f001 100755 --- a/mm-scripts.sh +++ b/mm-scripts.sh @@ -925,14 +925,15 @@ UPDATESERVICE(){ elif [ "${MM_UPDATE_REPO[${usrvc}]}" == "systemd" ]; then msg="Checking for update"; c=0; spc=''; spc1=$((${cw_spc}-${#msg})); until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done echo -en "${idsCL[White]}${msg}${spc} : ${idsCL[Default]}" - - if [ "$(apt-get -s upgrade | grep ${usrvc})" != "" ] || [ "${2}" == "force" ]; then + [ "${usrvc}" == "qbittorrent" ] && ausrvc="qbittorrent-nox" || ausrvc=${usrvc} + + if [ "$(apt-get -s upgrade | grep ${ausrvc})" != "" ] || [ "${2}" == "force" ]; then echo -e "${idsCL[Green]}Update Available${idsCL[Default]}" SERVICEBACKUP ${usrvc} msg="Updating service"; c=0; spc=''; spc1=$((${cw_spc}-${#msg})); until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done echo -en "${idsCL[White]}${msg}${spc} : ${idsCL[Default]}" - /usr/bin/apt install ${usrvc} >/dev/null 2>&1 + /usr/bin/apt install ${ausrvc} >/dev/null 2>&1 echo -e "${idsCL[Green]}Done${idsCL[Default]}" echo "$(date) - Updating Service (${usrvc}) : Completed" >> $logfile @@ -996,8 +997,8 @@ SHOWSRVCUPDATES(){ for usrvc in "${UPDATE_SERVICES[@]}"; do if [ "${usrvc}" != "organizr" ]; then if [ "${MM_UPDATE_REPO[${usrvc}]}" == "systemd" ]; then - - repo_ver=`dpkg -s ${usrvc} | grep Version` + [ "${usrvc}" == "qbittorrent" ] && ausrvc="qbittorrent-nox" || ausrvc=${usrvc} + repo_ver=`dpkg -s ${ausrvc} | grep Version` echo -e "${idsCL[LightCyan]}${MM_SERVICES[${usrvc}]}:${idsCL[Default]} Apt Repo Controller" echo -e "${idsCL[LightGreen]}Repo Release : ${repo_ver/Version: /v}${idsCL[Default]}" else