From 1d7642a670534f0590ce6e3715c8c2e5a7fd8347 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Thu, 27 Apr 2023 15:45:57 -0500 Subject: [PATCH] Update mm-scripts.sh --- mm-scripts.sh | 52 +++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/mm-scripts.sh b/mm-scripts.sh index 6d324f8..d4a000e 100755 --- a/mm-scripts.sh +++ b/mm-scripts.sh @@ -840,11 +840,11 @@ UPDATESERVICE(){ echo -en "${idsCL[White]}${msg}${spc} : ${idsCL[Default]}" if [[ $BETA_SERVICES == *${usrvc}* ]]; then - # latest_release_url=`curl -s https://api.github.com/repos/${MM_UPDATE_REPO[${usrvc}]}/${usrvc}/releases | jq -r '.[0].assets[].browser_download_url' | grep "${MM_UPDATE_REPO_GREP[${usrvc}]}" | cut -d '"' -f 4 | grep -i 'https://'` + latest_release_url=`curl -s https://api.github.com/repos/${MM_UPDATE_REPO[${usrvc}]}/${usrvc}/releases | jq -r '.[0].assets[].browser_download_url' | grep "${MM_UPDATE_REPO_GREP[${usrvc}]}" | cut -d '"' -f 4 | grep -i 'https://'` echo "$(date) - Updating Service (${usrvc}) : BETA UPDATEURL = ${latest_release_url}" >> $logfile beta="BETA " else - # latest_release_url=`curl -s https://api.github.com/repos/${MM_UPDATE_REPO[${usrvc}]}/${usrvc}/releases/latest | jq -r '.assets[].browser_download_url' | grep "${MM_UPDATE_REPO_GREP[${usrvc}]}" | cut -d '"' -f 4 | grep -i 'https://'` + latest_release_url=`curl -s https://api.github.com/repos/${MM_UPDATE_REPO[${usrvc}]}/${usrvc}/releases/latest | jq -r '.assets[].browser_download_url' | grep "${MM_UPDATE_REPO_GREP[${usrvc}]}" | cut -d '"' -f 4 | grep -i 'https://'` echo "$(date) - Updating Service (${usrvc}) : UPDATEURL = ${latest_release_url}" >> $logfile beta="" fi @@ -861,26 +861,26 @@ UPDATESERVICE(){ until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done echo -en "${idsCL[White]}${msg}${spc} : ${idsCL[Default]}" - # if curl --output /dev/null --silent --head --fail $latest_release_url; then - # wget -qO ${tmpfile} $latest_release_url >> ${MMFOLDER}/logs/update.${usrvc} - # if [[ ( $? -eq 0 ) && ( -f ${tmpfile} ) ]]; then - # if [ "${usrvc}" != "bazarr" ]; then - # rm -Rf /opt/${usrvc^} >> ${MMFOLDER}/logs/update.${usrvc} - # mkdir /opt/${usrvc^} >> ${MMFOLDER}/logs/update.${usrvc} - # fi - # /bin/tar -cpPf $bak /opt/${usrvc^} >> ${MMFOLDER}/logs/update.${usrvc} - # [ "${MM_SERVICE_CFG[${usrvc}]}" != "" ] && [ -d ${MM_SERVICE_CFG[${usrvc}]} ] && /bin/tar -cpPf $bakcfg ${MM_SERVICE_CFG[${usrvc}]} >> ${MMFOLDER}/logs/update.${usrvc} - # - # if [ "${usrvc}" == "ombi" ]; then - # /bin/tar xfP ${tmpfile} -C /opt/${usrvc^} >> ${MMFOLDER}/logs/update.${usrvc} - # elif [ "${usrvc}" == "bazarr" ]; then - # /usr/bin/unzip -oqq ${tmpfile} -d /opt/${usrvc^} - # else - # /bin/tar xfP ${tmpfile} -C /opt >> ${MMFOLDER}/logs/update.${usrvc} - # fi - # chown -R user:users /opt/${usrvc^} >> ${MMFOLDER}/logs/update.${usrvc} - # fi - # fi + if curl --output /dev/null --silent --head --fail $latest_release_url; then + wget -qO ${tmpfile} $latest_release_url >> ${MMFOLDER}/logs/update.${usrvc} + if [[ ( $? -eq 0 ) && ( -f ${tmpfile} ) ]]; then + if [ "${usrvc}" != "bazarr" ]; then + rm -Rf /opt/${usrvc^} >> ${MMFOLDER}/logs/update.${usrvc} + mkdir /opt/${usrvc^} >> ${MMFOLDER}/logs/update.${usrvc} + fi + /bin/tar -cpPf $bak /opt/${usrvc^} >> ${MMFOLDER}/logs/update.${usrvc} + [ "${MM_SERVICE_CFG[${usrvc}]}" != "" ] && [ -d ${MM_SERVICE_CFG[${usrvc}]} ] && /bin/tar -cpPf $bakcfg ${MM_SERVICE_CFG[${usrvc}]} >> ${MMFOLDER}/logs/update.${usrvc} + + if [ "${usrvc}" == "ombi" ]; then + /bin/tar xfP ${tmpfile} -C /opt/${usrvc^} >> ${MMFOLDER}/logs/update.${usrvc} + elif [ "${usrvc}" == "bazarr" ]; then + /usr/bin/unzip -oqq ${tmpfile} -d /opt/${usrvc^} + else + /bin/tar xfP ${tmpfile} -C /opt >> ${MMFOLDER}/logs/update.${usrvc} + fi + chown -R user:users /opt/${usrvc^} >> ${MMFOLDER}/logs/update.${usrvc} + fi + fi rm -f ${tmpfile} &>/dev/null echo -e "${idsCL[Green]}Done${idsCL[Default]}" @@ -899,8 +899,8 @@ UPDATESERVICE(){ echo -en "${idsCL[White]}${msg}${spc} : ${idsCL[Default]}" installed_ver=`dpkg -s ${usrvc} | grep Version` - # /usr/bin/apt install ${usrvc} >/dev/null 2>&1 - # /bin/systemctl disable ${usrvc} >/dev/null 2>&1 + /usr/bin/apt install ${usrvc} >/dev/null 2>&1 + /bin/systemctl disable ${usrvc} >/dev/null 2>&1 echo -e "${idsCL[Green]}Done${idsCL[Default]}" @@ -918,8 +918,8 @@ UPDATESERVICE(){ OUT=$(ip link | grep "$VPN_INTERFACE") >/dev/null 2>&1 if [[ " ${SERVICES_CHECK[*]} " =~ " ${usrvc} " ]] && [ ! -f ${MMFOLDER}/mm.noservices ] && [ ! `find /opt/idssys/mediamanager/ -name 'mm.plexmount.fail*'` ]; then /bin/systemctl disable ${usrvc} >> ${MMFOLDER}/logs/update.${usrvc} - # /bin/systemctl start ${usrvc} >> ${MMFOLDER}/logs/update.${usrvc} - # [ "${usrvc}" == "radarr" ] && [[ " ${SERVICES_CHECK[*]} " =~ " radarr3d " ]] && /bin/systemctl start radarr3d >> ${MMFOLDER}/logs/update.${usrvc} + /bin/systemctl start ${usrvc} >> ${MMFOLDER}/logs/update.${usrvc} + [ "${usrvc}" == "radarr" ] && [[ " ${SERVICES_CHECK[*]} " =~ " radarr3d " ]] && /bin/systemctl start radarr3d >> ${MMFOLDER}/logs/update.${usrvc} echo -e "${idsCL[Green]}Done${idsCL[Default]}" else echo -e "${idsCL[LightCyan]}Skipping${idsCL[Default]}"