voltron/mediamanager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
David Schroeder
2023-04-27 21:39:33 -05:00
parent ce0a8b9a5d 831d37d650
commit a8532eec42
2 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
defaults.inc
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
VERS='3.8.140-04232023' VERS='3.8.142-04232023'
MMFOLDER="/opt/idssys/mediamanager" MMFOLDER="/opt/idssys/mediamanager"
MMSRV=$(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1) MMSRV=$(/sbin/ip -o -4 addr list eth0 | awk '{print $4}' | cut -d/ -f1)

24
mm-scripts.sh
View File

@@ -1387,34 +1387,22 @@ if [ ! -f ${MMFOLDER}/mm.update.stop ]; then
fi fi
MMSTATUS ${2} MMSTATUS ${2}
;; ;;
setup) setup) MMSETUP;;
MMSETUP vpninfo) GETVPNINFO;;
;; speedtest) VPNSPEEDTEST;;
vpninfo)
GETVPNINFO
;;
speedtest)
VPNSPEEDTEST
;;
update);; update);;
update-service) update-service) UPDATESERVICE ${2};;
UPDATESERVICE ${2}
;;
update-allservices) update-allservices)
# for usrvc in "${SERVICES_CHECK[@]}"; do # for usrvc in "${SERVICES_CHECK[@]}"; do
for usrvc in "${UPDATE_SERVICES[@]}"; do for usrvc in "${UPDATE_SERVICES[@]}"; do
[ "${MM_UPDATE_REPO[${usrvc}]}" != "" ] && UPDATESERVICE ${usrvc} [ "${MM_UPDATE_REPO[${usrvc}]}" != "" ] && UPDATESERVICE ${usrvc}
done done
;; ;;
update-list) SHOWSRVCUPDATES;; update-list) SHOWSRVCUPDATES;;
update-organizr) UPDATEORGANIZR;; update-organizr) UPDATEORGANIZR;;
clear) echo -e "${idsCL[LightCyan]}Clearing all mm.* files ${idsCL[Default]}"; echo;;
clear) echo -e "${idsCL[LightCyan]}Clearing all mm.* files ${idsCL[Default]}"
echo
;;
*) USAGE;; *) USAGE;;
esac esac
else else