From d1f614cd43b8c660f56bc0bbf7e33db81b6fd432 Mon Sep 17 00:00:00 2001 From: kenzok8 Date: Thu, 22 Aug 2024 20:34:22 +0800 Subject: [PATCH] update 2024-08-22 20:34:22 --- luci-app-bmtedge/Makefile | 2 +- .../root/usr/libexec/istorec/bmtedge.sh | 4 ++-- luci-app-chinesesubfinder/Makefile | 2 +- .../root/usr/libexec/istorec/chinesesubfinder.sh | 2 +- luci-app-clouddrive2/Makefile | 2 +- .../root/usr/libexec/istorec/clouddrive2.sh | 4 ++-- luci-app-codeserver/Makefile | 2 +- .../root/usr/libexec/istorec/codeserver.sh | 4 ++-- luci-app-drawio/Makefile | 2 +- .../root/usr/libexec/istorec/drawio.sh | 4 ++-- luci-app-emby/Makefile | 2 +- luci-app-emby/root/usr/libexec/istorec/emby.sh | 4 ++-- luci-app-excalidraw/Makefile | 2 +- .../root/usr/libexec/istorec/excalidraw.sh | 4 ++-- luci-app-feishuvpn/Makefile | 2 +- .../root/usr/libexec/istorec/feishuvpn.sh | 2 +- luci-app-gogs/Makefile | 2 +- luci-app-gogs/root/usr/libexec/istorec/gogs.sh | 2 +- luci-app-heimdall/Makefile | 2 +- .../root/usr/libexec/istorec/heimdall.sh | 6 +++--- luci-app-homeassistant/Makefile | 2 +- .../root/usr/libexec/istorec/homeassistant.sh | 4 ++-- luci-app-htreader/Makefile | 2 +- .../root/usr/libexec/istorec/htreader.sh | 4 ++-- luci-app-istorepanel/Makefile | 2 +- .../root/usr/libexec/istorec/istorepanel.sh | 4 ++-- luci-app-ittools/Makefile | 2 +- .../root/usr/libexec/istorec/ittools.sh | 4 ++-- luci-app-jackett/Makefile | 2 +- .../root/usr/libexec/istorec/jackett.sh | 4 ++-- luci-app-jellyfin/Makefile | 2 +- luci-app-jellyfin/luasrc/model/cbi/jellyfin.lua | 15 ++++++++++++++- luci-app-jellyfin/po/zh-cn/jellyfin.po | 10 ++++++++-- .../root/etc/uci-defaults/luci-app-jellyfin | 4 ++-- .../root/usr/libexec/istorec/jellyfin.sh | 6 +++--- luci-app-lanraragi/Makefile | 2 +- .../root/usr/libexec/istorec/lanraragi.sh | 4 ++-- luci-app-memos/Makefile | 2 +- luci-app-memos/root/usr/libexec/istorec/memos.sh | 4 ++-- luci-app-mtphotos/Makefile | 2 +- .../root/usr/libexec/istorec/mtphotos.sh | 4 ++-- luci-app-nastools/Makefile | 2 +- .../root/usr/libexec/istorec/nastools.sh | 4 ++-- luci-app-navidrome/Makefile | 2 +- .../root/usr/libexec/istorec/navidrome.sh | 4 ++-- luci-app-nextcloud/Makefile | 2 +- .../root/usr/libexec/istorec/nextcloud.sh | 4 ++-- luci-app-owntone/Makefile | 2 +- .../root/usr/libexec/istorec/owntone.sh | 2 +- luci-app-penpot/Makefile | 2 +- .../root/usr/libexec/istorec/penpot.sh | 2 +- luci-app-photoprism/Makefile | 2 +- .../root/usr/libexec/istorec/photoprism.sh | 4 ++-- luci-app-plex/Makefile | 2 +- luci-app-plex/root/usr/libexec/istorec/plex.sh | 4 ++-- luci-app-typecho/Makefile | 2 +- .../root/usr/libexec/istorec/typecho.sh | 4 ++-- luci-app-ubuntu/Makefile | 2 +- .../root/usr/libexec/istorec/ubuntu.sh | 4 ++-- luci-app-unifi/Makefile | 2 +- luci-app-unifi/root/usr/libexec/istorec/unifi.sh | 4 ++-- luci-app-vaultwarden/Makefile | 2 +- .../root/usr/libexec/istorec/vaultwarden.sh | 2 +- luci-app-webvirtcloud/Makefile | 2 +- .../root/usr/libexec/istorec/webvirtcloud.sh | 4 ++-- luci-app-wxedge/Makefile | 2 +- .../root/usr/libexec/istorec/wxedge.sh | 4 ++-- luci-app-xteve/Makefile | 2 +- luci-app-xteve/root/usr/libexec/istorec/xteve.sh | 4 ++-- 69 files changed, 119 insertions(+), 100 deletions(-) diff --git a/luci-app-bmtedge/Makefile b/luci-app-bmtedge/Makefile index 65421aa2f..06c01faa6 100644 --- a/luci-app-bmtedge/Makefile +++ b/luci-app-bmtedge/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.1-20240718 +PKG_VERSION:=1.0.1-20240822 PKG_RELEASE:= LUCI_TITLE:=LuCI support for bmtedge diff --git a/luci-app-bmtedge/root/usr/libexec/istorec/bmtedge.sh b/luci-app-bmtedge/root/usr/libexec/istorec/bmtedge.sh index 31410294d..ed5b6c79e 100755 --- a/luci-app-bmtedge/root/usr/libexec/istorec/bmtedge.sh +++ b/luci-app-bmtedge/root/usr/libexec/istorec/bmtedge.sh @@ -91,10 +91,10 @@ EOF docker ${ACTION} bmtedge ;; "status") - docker ps --all -f 'name=bmtedge' --format '{{.State}}' + docker ps --all -f 'name=^/bmtedge$' --format '{{.State}}' ;; "port") - docker ps --all -f 'name=bmtedge' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' + docker ps --all -f 'name=^/bmtedge$' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' ;; *) usage diff --git a/luci-app-chinesesubfinder/Makefile b/luci-app-chinesesubfinder/Makefile index 55868d238..58a69e454 100644 --- a/luci-app-chinesesubfinder/Makefile +++ b/luci-app-chinesesubfinder/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.3-20240113 +PKG_VERSION:=1.0.3-20240822 PKG_RELEASE:= LUCI_TITLE:=LuCI support for ChineseSubFinder diff --git a/luci-app-chinesesubfinder/root/usr/libexec/istorec/chinesesubfinder.sh b/luci-app-chinesesubfinder/root/usr/libexec/istorec/chinesesubfinder.sh index 531fc6cac..31729ea9d 100755 --- a/luci-app-chinesesubfinder/root/usr/libexec/istorec/chinesesubfinder.sh +++ b/luci-app-chinesesubfinder/root/usr/libexec/istorec/chinesesubfinder.sh @@ -66,7 +66,7 @@ case ${ACTION} in docker ${ACTION} chinesesubfinder ;; "status") - docker ps --all -f 'name=chinesesubfinder' --format '{{.State}}' + docker ps --all -f 'name=^/chinesesubfinder$' --format '{{.State}}' ;; "port") uci -q get chinesesubfinder.@main[0].http_port 2>/dev/null diff --git a/luci-app-clouddrive2/Makefile b/luci-app-clouddrive2/Makefile index fae6fbc41..2a16da601 100644 --- a/luci-app-clouddrive2/Makefile +++ b/luci-app-clouddrive2/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.1-20240117 +PKG_VERSION:=1.0.1-20240822 PKG_RELEASE:= LUCI_TITLE:=LuCI support for CloudDrive2 diff --git a/luci-app-clouddrive2/root/usr/libexec/istorec/clouddrive2.sh b/luci-app-clouddrive2/root/usr/libexec/istorec/clouddrive2.sh index dc54b0988..1e598e672 100755 --- a/luci-app-clouddrive2/root/usr/libexec/istorec/clouddrive2.sh +++ b/luci-app-clouddrive2/root/usr/libexec/istorec/clouddrive2.sh @@ -93,10 +93,10 @@ case ${ACTION} in docker ${ACTION} clouddrive2 ;; "status") - docker ps --all -f 'name=clouddrive2' --format '{{.State}}' + docker ps --all -f 'name=^/clouddrive2$' --format '{{.State}}' ;; "port") - docker ps --all -f 'name=clouddrive2' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*->19798/tcp' | sed 's/0.0.0.0:\([0-9]*\)->.*/\1/' + docker ps --all -f 'name=^/clouddrive2$' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*->19798/tcp' | sed 's/0.0.0.0:\([0-9]*\)->.*/\1/' ;; *) usage diff --git a/luci-app-codeserver/Makefile b/luci-app-codeserver/Makefile index f1fc4785e..c7a7459a8 100644 --- a/luci-app-codeserver/Makefile +++ b/luci-app-codeserver/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.1-20231208 +PKG_VERSION:=1.0.1-20240822 PKG_RELEASE:= LUCI_TITLE:=LuCI support for CodeServer diff --git a/luci-app-codeserver/root/usr/libexec/istorec/codeserver.sh b/luci-app-codeserver/root/usr/libexec/istorec/codeserver.sh index 86543af33..7e7b1c2e8 100755 --- a/luci-app-codeserver/root/usr/libexec/istorec/codeserver.sh +++ b/luci-app-codeserver/root/usr/libexec/istorec/codeserver.sh @@ -72,10 +72,10 @@ case ${ACTION} in docker ${ACTION} codeserver ;; "status") - docker ps --all -f 'name=codeserver' --format '{{.State}}' + docker ps --all -f 'name=^/codeserver$' --format '{{.State}}' ;; "port") - docker ps --all -f 'name=codeserver' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' + docker ps --all -f 'name=^/codeserver$' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' ;; "git-config") docker exec codeserver git config --global user.name "${1}" diff --git a/luci-app-drawio/Makefile b/luci-app-drawio/Makefile index 4ecf2f050..e0f9ff000 100644 --- a/luci-app-drawio/Makefile +++ b/luci-app-drawio/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.0-20221212 +PKG_VERSION:=1.0.0-20240822 PKG_RELEASE:= LUCI_TITLE:=LuCI support for DrawIO diff --git a/luci-app-drawio/root/usr/libexec/istorec/drawio.sh b/luci-app-drawio/root/usr/libexec/istorec/drawio.sh index 4ab80afd9..20e1176b4 100755 --- a/luci-app-drawio/root/usr/libexec/istorec/drawio.sh +++ b/luci-app-drawio/root/usr/libexec/istorec/drawio.sh @@ -59,10 +59,10 @@ case ${ACTION} in cd $config && docker-compose ${ACTION} ;; "status") - docker ps --all -f 'name=linkease-drawio_drawio_1' --format '{{.State}}' + docker ps --all -f 'name=^/linkease-drawio_drawio_1$' --format '{{.State}}' ;; "port") - docker ps --all -f 'name=linkease-drawio_drawio_1' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' + docker ps --all -f 'name=^/linkease-drawio_drawio_1$' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' ;; *) usage diff --git a/luci-app-emby/Makefile b/luci-app-emby/Makefile index b047c0ff2..a31d35cc5 100644 --- a/luci-app-emby/Makefile +++ b/luci-app-emby/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.3-20231208 +PKG_VERSION:=1.0.3-20240822 PKG_RELEASE:= LUCI_TITLE:=LuCI support for Emby diff --git a/luci-app-emby/root/usr/libexec/istorec/emby.sh b/luci-app-emby/root/usr/libexec/istorec/emby.sh index e5df501f3..3158092c5 100755 --- a/luci-app-emby/root/usr/libexec/istorec/emby.sh +++ b/luci-app-emby/root/usr/libexec/istorec/emby.sh @@ -81,10 +81,10 @@ case ${ACTION} in docker ${ACTION} emby ;; "status") - docker ps --all -f 'name=emby' --format '{{.State}}' + docker ps --all -f 'name=^/emby$' --format '{{.State}}' ;; "port") - docker ps --all -f 'name=emby' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*->8096/tcp' | sed 's/0.0.0.0:\([0-9]*\)->.*/\1/' + docker ps --all -f 'name=^/emby$' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*->8096/tcp' | sed 's/0.0.0.0:\([0-9]*\)->.*/\1/' ;; *) usage diff --git a/luci-app-excalidraw/Makefile b/luci-app-excalidraw/Makefile index f57f43163..b187745fc 100644 --- a/luci-app-excalidraw/Makefile +++ b/luci-app-excalidraw/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.0-20221212 +PKG_VERSION:=1.0.0-20240822 PKG_RELEASE:= LUCI_TITLE:=LuCI support for Excalidraw diff --git a/luci-app-excalidraw/root/usr/libexec/istorec/excalidraw.sh b/luci-app-excalidraw/root/usr/libexec/istorec/excalidraw.sh index 5edea429a..8f1aaa256 100755 --- a/luci-app-excalidraw/root/usr/libexec/istorec/excalidraw.sh +++ b/luci-app-excalidraw/root/usr/libexec/istorec/excalidraw.sh @@ -60,10 +60,10 @@ case ${ACTION} in cd $config && docker-compose ${ACTION} ;; "status") - docker ps --all -f 'name=linkease-excalidraw_frontend_1' --format '{{.State}}' + docker ps --all -f 'name=^/linkease-excalidraw_frontend_1$' --format '{{.State}}' ;; "port") - docker ps --all -f 'name=linkease-excalidraw_frontend_1' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' + docker ps --all -f 'name=^/linkease-excalidraw_frontend_1$' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' ;; *) usage diff --git a/luci-app-feishuvpn/Makefile b/luci-app-feishuvpn/Makefile index 561d51182..8b4a3bfd7 100644 --- a/luci-app-feishuvpn/Makefile +++ b/luci-app-feishuvpn/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.2-20231208 +PKG_VERSION:=1.0.2-20240822 PKG_RELEASE:= LUCI_TITLE:=LuCI support for FeiShuVpn diff --git a/luci-app-feishuvpn/root/usr/libexec/istorec/feishuvpn.sh b/luci-app-feishuvpn/root/usr/libexec/istorec/feishuvpn.sh index 0ba2e807e..9918f366e 100755 --- a/luci-app-feishuvpn/root/usr/libexec/istorec/feishuvpn.sh +++ b/luci-app-feishuvpn/root/usr/libexec/istorec/feishuvpn.sh @@ -62,7 +62,7 @@ case ${ACTION} in docker ${ACTION} feishuvpn ;; "status") - docker ps --all -f 'name=feishuvpn' --format '{{.State}}' + docker ps --all -f 'name=^/feishuvpn$' --format '{{.State}}' ;; "port") echo 9091 diff --git a/luci-app-gogs/Makefile b/luci-app-gogs/Makefile index 3aff85b50..b5aa1fe74 100644 --- a/luci-app-gogs/Makefile +++ b/luci-app-gogs/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.3-20240304 +PKG_VERSION:=1.0.3-20240822 PKG_RELEASE:= LUCI_TITLE:=LuCI support for Gogs diff --git a/luci-app-gogs/root/usr/libexec/istorec/gogs.sh b/luci-app-gogs/root/usr/libexec/istorec/gogs.sh index 78abb931a..263c6296e 100755 --- a/luci-app-gogs/root/usr/libexec/istorec/gogs.sh +++ b/luci-app-gogs/root/usr/libexec/istorec/gogs.sh @@ -67,7 +67,7 @@ case ${ACTION} in docker ${ACTION} gogs ;; "status") - docker ps --all -f 'name=gogs' --format '{{.State}}' + docker ps --all -f 'name=^/gogs$' --format '{{.State}}' ;; "port") uci -q get gogs.@main[0].http_port 2>/dev/null diff --git a/luci-app-heimdall/Makefile b/luci-app-heimdall/Makefile index ca5ddb3b5..e30275934 100644 --- a/luci-app-heimdall/Makefile +++ b/luci-app-heimdall/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.1.2-20240105 +PKG_VERSION:=1.1.2-20240822 PKG_RELEASE:= LUCI_TITLE:=LuCI support for heimdall diff --git a/luci-app-heimdall/root/usr/libexec/istorec/heimdall.sh b/luci-app-heimdall/root/usr/libexec/istorec/heimdall.sh index dda3f614c..a68bc40da 100755 --- a/luci-app-heimdall/root/usr/libexec/istorec/heimdall.sh +++ b/luci-app-heimdall/root/usr/libexec/istorec/heimdall.sh @@ -73,13 +73,13 @@ case ${ACTION} in docker ${ACTION} heimdall ;; "status") - docker ps --all -f 'name=heimdall' --format '{{.State}}' + docker ps --all -f 'name=^/heimdall$' --format '{{.State}}' ;; "port") - docker ps --all -f 'name=heimdall' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*->80/tcp' | sed 's/0.0.0.0:\([0-9]*\)->.*/\1/' + docker ps --all -f 'name=^/heimdall$' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*->80/tcp' | sed 's/0.0.0.0:\([0-9]*\)->.*/\1/' ;; "https_port") - docker ps --all -f 'name=heimdall' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*->443/tcp' | sed 's/0.0.0.0:\([0-9]*\)->.*/\1/' + docker ps --all -f 'name=^/heimdall$' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*->443/tcp' | sed 's/0.0.0.0:\([0-9]*\)->.*/\1/' ;; *) usage diff --git a/luci-app-homeassistant/Makefile b/luci-app-homeassistant/Makefile index 47dd1b095..7b791fbb4 100644 --- a/luci-app-homeassistant/Makefile +++ b/luci-app-homeassistant/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.1.2-20231208 +PKG_VERSION:=1.1.2-20240822 PKG_RELEASE:= LUCI_TITLE:=LuCI support for homeassistant diff --git a/luci-app-homeassistant/root/usr/libexec/istorec/homeassistant.sh b/luci-app-homeassistant/root/usr/libexec/istorec/homeassistant.sh index 2fe6a992a..d91d40d61 100755 --- a/luci-app-homeassistant/root/usr/libexec/istorec/homeassistant.sh +++ b/luci-app-homeassistant/root/usr/libexec/istorec/homeassistant.sh @@ -74,10 +74,10 @@ case ${ACTION} in docker ${ACTION} homeassistant ;; "status") - docker ps --all -f 'name=homeassistant' --format '{{.State}}' + docker ps --all -f 'name=^/homeassistant$' --format '{{.State}}' ;; "port") - docker ps --all -f 'name=homeassistant' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' + docker ps --all -f 'name=^/homeassistant$' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' ;; "hacs-install") do_hacs_install diff --git a/luci-app-htreader/Makefile b/luci-app-htreader/Makefile index 563782861..4301b4894 100644 --- a/luci-app-htreader/Makefile +++ b/luci-app-htreader/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.2-20231208 +PKG_VERSION:=1.0.2-20240822 PKG_RELEASE:= LUCI_TITLE:=LuCI support for HTReader diff --git a/luci-app-htreader/root/usr/libexec/istorec/htreader.sh b/luci-app-htreader/root/usr/libexec/istorec/htreader.sh index 48e2a6565..f6dc4380f 100755 --- a/luci-app-htreader/root/usr/libexec/istorec/htreader.sh +++ b/luci-app-htreader/root/usr/libexec/istorec/htreader.sh @@ -74,10 +74,10 @@ case ${ACTION} in docker ${ACTION} htreader ;; "status") - docker ps --all -f 'name=htreader' --format '{{.State}}' + docker ps --all -f 'name=^/htreader$' --format '{{.State}}' ;; "port") - docker ps --all -f 'name=htreader' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*->9060/tcp' | sed 's/0.0.0.0:\([0-9]*\)->.*/\1/' + docker ps --all -f 'name=^/htreader$' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*->9060/tcp' | sed 's/0.0.0.0:\([0-9]*\)->.*/\1/' ;; *) usage diff --git a/luci-app-istorepanel/Makefile b/luci-app-istorepanel/Makefile index 787cd514d..5ec295184 100644 --- a/luci-app-istorepanel/Makefile +++ b/luci-app-istorepanel/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.6-20240718 +PKG_VERSION:=1.0.6-20240822 PKG_RELEASE:= LUCI_TITLE:=LuCI support for 1Panel diff --git a/luci-app-istorepanel/root/usr/libexec/istorec/istorepanel.sh b/luci-app-istorepanel/root/usr/libexec/istorec/istorepanel.sh index 64b0f7da7..34cdaf4aa 100755 --- a/luci-app-istorepanel/root/usr/libexec/istorec/istorepanel.sh +++ b/luci-app-istorepanel/root/usr/libexec/istorec/istorepanel.sh @@ -76,7 +76,7 @@ EOF for b in {1..30} do sleep 3 - docker_status=`docker ps --all -f 'name=istorepanel' --format '{{.State}}'` + docker_status=`docker ps --all -f 'name=^/istorepanel$' --format '{{.State}}'` if [[ $docker_status == *running* ]]; then docker exec istorepanel /app/reinstall.sh echo "Installed OK, waiting 10s for running" @@ -112,7 +112,7 @@ case ${ACTION} in docker ${ACTION} istorepanel ;; "status") - docker ps --all -f 'name=istorepanel' --format '{{.State}}' + docker ps --all -f 'name=^/istorepanel$' --format '{{.State}}' ;; "port") echo `uci get istorepanel.@main[0].port 2>/dev/null` diff --git a/luci-app-ittools/Makefile b/luci-app-ittools/Makefile index 28a031a0c..786eb4850 100644 --- a/luci-app-ittools/Makefile +++ b/luci-app-ittools/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.2-20231208 +PKG_VERSION:=1.0.2-20240822 PKG_RELEASE:= LUCI_TITLE:=LuCI support for ITTools diff --git a/luci-app-ittools/root/usr/libexec/istorec/ittools.sh b/luci-app-ittools/root/usr/libexec/istorec/ittools.sh index 353f1f0f0..9c82f6930 100755 --- a/luci-app-ittools/root/usr/libexec/istorec/ittools.sh +++ b/luci-app-ittools/root/usr/libexec/istorec/ittools.sh @@ -56,10 +56,10 @@ case ${ACTION} in docker ${ACTION} ittools ;; "status") - docker ps --all -f 'name=ittools' --format '{{.State}}' + docker ps --all -f 'name=^/ittools$' --format '{{.State}}' ;; "port") - docker ps --all -f 'name=ittools' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*->9070/tcp' | sed 's/0.0.0.0:\([0-9]*\)->.*/\1/' + docker ps --all -f 'name=^/ittools$' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*->9070/tcp' | sed 's/0.0.0.0:\([0-9]*\)->.*/\1/' ;; *) usage diff --git a/luci-app-jackett/Makefile b/luci-app-jackett/Makefile index 7ed29d615..b7ec02bff 100644 --- a/luci-app-jackett/Makefile +++ b/luci-app-jackett/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.1.1-20231208 +PKG_VERSION:=1.1.1-20240822 PKG_RELEASE:= LUCI_TITLE:=LuCI support for jackett diff --git a/luci-app-jackett/root/usr/libexec/istorec/jackett.sh b/luci-app-jackett/root/usr/libexec/istorec/jackett.sh index b4210071d..8d181a313 100755 --- a/luci-app-jackett/root/usr/libexec/istorec/jackett.sh +++ b/luci-app-jackett/root/usr/libexec/istorec/jackett.sh @@ -76,10 +76,10 @@ case ${ACTION} in docker ${ACTION} jackett ;; "status") - docker ps --all -f 'name=jackett' --format '{{.State}}' + docker ps --all -f 'name=^/jackett$' --format '{{.State}}' ;; "port") - docker ps --all -f 'name=jackett' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' + docker ps --all -f 'name=^/jackett$' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' ;; *) usage diff --git a/luci-app-jellyfin/Makefile b/luci-app-jellyfin/Makefile index d201328b7..f5456b4da 100644 --- a/luci-app-jellyfin/Makefile +++ b/luci-app-jellyfin/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.1.10-20240224 +PKG_VERSION:=1.2.0-20240822 PKG_RELEASE:= LUCI_TITLE:=LuCI support for jellyfin diff --git a/luci-app-jellyfin/luasrc/model/cbi/jellyfin.lua b/luci-app-jellyfin/luasrc/model/cbi/jellyfin.lua index 7325e86c9..e24525ecb 100644 --- a/luci-app-jellyfin/luasrc/model/cbi/jellyfin.lua +++ b/luci-app-jellyfin/luasrc/model/cbi/jellyfin.lua @@ -10,7 +10,7 @@ m = taskd.docker_map("jellyfin", "jellyfin", "/usr/libexec/istorec/jellyfin.sh", translate("Jellyfin"), translate("Jellyfin is the volunteer-built media solution that puts you in control of your media. Stream to any device from your own server, with no strings attached. Your media, your server, your way.") .. translate("Official website:") .. ' https://jellyfin.org/' - .. "
" .. translate("The following models support hardware transcoding without configuration in Jellyfin:") .. "
" + .. "
" .. translate("When using the default image, the following models support hardware transcoding without configuration in Jellyfin:") .. "
" .. "
- Easepi ARS2
" .. "
- " .. translate("RK35xx series (e.g. R6S, R5S, R68s, R66s, H28K, etc.) with iStoreOS firmware (version 20221123 and above). Other firmwares require MPP and RGA to be turned on, and are not guaranteed to be available.") .. "
" .. "
" .. translate("The following models may support hardware transcoding by referring to the official Jellyfin documentation:") .. "
" @@ -27,6 +27,19 @@ s = m:section(TypedSection, "jellyfin", translate("Setup"), s.addremove=false s.anonymous=true +o = s:option(Value, "image", translate("Image")) +o.datatype = "string" +o:value("", translate("Default")) +if luci.sys.call("grep -q 'rockchip,' /proc/device-tree/compatible 2>/dev/null") == 0 then + o:value("jjm2473/jellyfin-mpp", "jjm2473/jellyfin-mpp") + o:value("nyanmisaka/jellyfin:latest-rockchip", "nyanmisaka/jellyfin:latest-rockchip") +end +o:value("jellyfin/jellyfin", "jellyfin/jellyfin") +o:value("linuxserver/jellyfin", "linuxserver/jellyfin") +if luci.sys.call("uname -m |grep -qw x86_64") == 0 then + o:value("nyanmisaka/jellyfin", "nyanmisaka/jellyfin") +end + o = s:option(Flag, "hostnet", translate("Host network"), translate("Jellyfin running in host network, for DLNA application, port is always 8096 if enabled")) o.default = 0 o.rmempty = false diff --git a/luci-app-jellyfin/po/zh-cn/jellyfin.po b/luci-app-jellyfin/po/zh-cn/jellyfin.po index 1ed052119..6faf28a77 100644 --- a/luci-app-jellyfin/po/zh-cn/jellyfin.po +++ b/luci-app-jellyfin/po/zh-cn/jellyfin.po @@ -7,8 +7,8 @@ msgstr "官方网站：" msgid "Jellyfin is the volunteer-built media solution that puts you in control of your media. Stream to any device from your own server, with no strings attached. Your media, your server, your way." msgstr "Jellyfin 是志愿者构建的媒体解决方案，可让您控制自己的电影等媒体，并不受任何限制地让您从各种设备去观看您的媒体。" -msgid "The following models support hardware transcoding without configuration in Jellyfin:" -msgstr "以下机型无需在Jellyfin配置即支持硬件转码：" +msgid "When using the default image, the following models support hardware transcoding without configuration in Jellyfin:" +msgstr "当使用默认镜像时以下机型无需在Jellyfin配置即支持硬件转码：" msgid "RK35xx series (e.g. R6S, R5S, R68s, R66s, H28K, etc.) with iStoreOS firmware (version 20221123 and above). Other firmwares require MPP and RGA to be turned on, and are not guaranteed to be available." msgstr "RK35xx 系列（例如R6S，R5S，R68s，R66s，H28K等）并使用 iStoreOS 固件（版本20221123及以上）。其他固件需开启MPP和RGA，不保证可用。" @@ -22,6 +22,12 @@ msgstr "x86 系列" msgid "Raspberry Pi series" msgstr "树莓派系列" +msgid "Image" +msgstr "镜像" + +msgid "Default" +msgstr "默认" + msgid "Media path" msgstr "媒体路径" diff --git a/luci-app-jellyfin/root/etc/uci-defaults/luci-app-jellyfin b/luci-app-jellyfin/root/etc/uci-defaults/luci-app-jellyfin index b5f36629d..61991a5ab 100644 --- a/luci-app-jellyfin/root/etc/uci-defaults/luci-app-jellyfin +++ b/luci-app-jellyfin/root/etc/uci-defaults/luci-app-jellyfin @@ -2,9 +2,9 @@ image_name=`uci get jellyfin.@jellyfin[0].image 2>/dev/null` -if [ "$image_name" == "jjm2473/jellyfin-rtk:latest" ]; then +if [ "$image_name" == "jjm2473/jellyfin-rtk:latest" -o "$image_name" == "default" ]; then uci -q batch <<-EOF >/dev/null - set jellyfin.@jellyfin[0].image="default" + delete jellyfin.@jellyfin[0].image commit jellyfin EOF fi diff --git a/luci-app-jellyfin/root/usr/libexec/istorec/jellyfin.sh b/luci-app-jellyfin/root/usr/libexec/istorec/jellyfin.sh index e09ac21f1..adef3fd9d 100755 --- a/luci-app-jellyfin/root/usr/libexec/istorec/jellyfin.sh +++ b/luci-app-jellyfin/root/usr/libexec/istorec/jellyfin.sh @@ -81,7 +81,7 @@ do_install_detail() { cmd="$cmd\ -t \ --privileged " - for dev in iep rga dri dma_heap mpp_service mpp-service vpu_service vpu-service \ + for dev in iep rga dri dma_heap mali0 mpp_service mpp-service vpu_service vpu-service \ hevc_service hevc-service rkvdec rkvenc avsd vepu h265e ; do [ -e "/dev/$dev" ] && cmd="$cmd --device /dev/$dev" done @@ -139,10 +139,10 @@ case ${ACTION} in docker ${ACTION} jellyfin ;; "status") - docker ps --all -f 'name=jellyfin' --format '{{.State}}' + docker ps --all -f 'name=^/jellyfin$' --format '{{.State}}' ;; "port") - docker ps --all -f 'name=jellyfin' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*->8096/tcp' | sed 's/0.0.0.0:\([0-9]*\)->.*/\1/' + docker ps --all -f 'name=^/jellyfin$' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*->8096/tcp' | sed 's/0.0.0.0:\([0-9]*\)->.*/\1/' ;; *) usage diff --git a/luci-app-lanraragi/Makefile b/luci-app-lanraragi/Makefile index 0a99be551..8ddd891d0 100644 --- a/luci-app-lanraragi/Makefile +++ b/luci-app-lanraragi/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.1-20231208 +PKG_VERSION:=1.0.1-20240822 PKG_RELEASE:= LUCI_TITLE:=LuCI support for LANraragi diff --git a/luci-app-lanraragi/root/usr/libexec/istorec/lanraragi.sh b/luci-app-lanraragi/root/usr/libexec/istorec/lanraragi.sh index 76d661298..9ffb4e2ef 100755 --- a/luci-app-lanraragi/root/usr/libexec/istorec/lanraragi.sh +++ b/luci-app-lanraragi/root/usr/libexec/istorec/lanraragi.sh @@ -63,10 +63,10 @@ case ${ACTION} in docker ${ACTION} lanraragi ;; "status") - docker ps --all -f 'name=lanraragi' --format '{{.State}}' + docker ps --all -f 'name=^/lanraragi$' --format '{{.State}}' ;; "port") - docker ps --all -f 'name=lanraragi' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' + docker ps --all -f 'name=^/lanraragi$' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' ;; *) usage diff --git a/luci-app-memos/Makefile b/luci-app-memos/Makefile index 1d256c6e9..3172f27c8 100644 --- a/luci-app-memos/Makefile +++ b/luci-app-memos/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.2-20231208 +PKG_VERSION:=1.0.2-20240822 PKG_RELEASE:= LUCI_TITLE:=LuCI support for Memos diff --git a/luci-app-memos/root/usr/libexec/istorec/memos.sh b/luci-app-memos/root/usr/libexec/istorec/memos.sh index 8b72b06f4..6296de3c7 100755 --- a/luci-app-memos/root/usr/libexec/istorec/memos.sh +++ b/luci-app-memos/root/usr/libexec/istorec/memos.sh @@ -62,10 +62,10 @@ case ${ACTION} in docker ${ACTION} memos ;; "status") - docker ps --all -f 'name=memos' --format '{{.State}}' + docker ps --all -f 'name=^/memos$' --format '{{.State}}' ;; "port") - docker ps --all -f 'name=memos' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' + docker ps --all -f 'name=^/memos$' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' ;; *) usage diff --git a/luci-app-mtphotos/Makefile b/luci-app-mtphotos/Makefile index c8cff5921..b35384eb7 100644 --- a/luci-app-mtphotos/Makefile +++ b/luci-app-mtphotos/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.2-20231208 +PKG_VERSION:=1.0.2-20240822 PKG_RELEASE:= LUCI_TITLE:=LuCI support for MTPhotos diff --git a/luci-app-mtphotos/root/usr/libexec/istorec/mtphotos.sh b/luci-app-mtphotos/root/usr/libexec/istorec/mtphotos.sh index ce6a99a8c..8eea91f60 100755 --- a/luci-app-mtphotos/root/usr/libexec/istorec/mtphotos.sh +++ b/luci-app-mtphotos/root/usr/libexec/istorec/mtphotos.sh @@ -65,10 +65,10 @@ case ${ACTION} in docker ${ACTION} mtphotos ;; "status") - docker ps --all -f 'name=mtphotos' --format '{{.State}}' + docker ps --all -f 'name=^/mtphotos$' --format '{{.State}}' ;; "port") - docker ps --all -f 'name=mtphotos' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*->8063/tcp' | sed 's/0.0.0.0:\([0-9]*\)->.*/\1/' + docker ps --all -f 'name=^/mtphotos$' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*->8063/tcp' | sed 's/0.0.0.0:\([0-9]*\)->.*/\1/' ;; *) usage diff --git a/luci-app-nastools/Makefile b/luci-app-nastools/Makefile index afff11d95..8846fdf21 100644 --- a/luci-app-nastools/Makefile +++ b/luci-app-nastools/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.1.3-20231208 +PKG_VERSION:=1.1.3-20240822 PKG_RELEASE:= LUCI_TITLE:=LuCI support for nastools diff --git a/luci-app-nastools/root/usr/libexec/istorec/nastools.sh b/luci-app-nastools/root/usr/libexec/istorec/nastools.sh index d46018240..b0022ba61 100755 --- a/luci-app-nastools/root/usr/libexec/istorec/nastools.sh +++ b/luci-app-nastools/root/usr/libexec/istorec/nastools.sh @@ -77,10 +77,10 @@ case ${ACTION} in docker ${ACTION} nastools ;; "status") - docker ps --all -f 'name=nastools' --format '{{.State}}' + docker ps --all -f 'name=^/nastools$' --format '{{.State}}' ;; "port") - docker ps --all -f 'name=nastools' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' + docker ps --all -f 'name=^/nastools$' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' ;; *) usage diff --git a/luci-app-navidrome/Makefile b/luci-app-navidrome/Makefile index 198b9950f..d78379858 100644 --- a/luci-app-navidrome/Makefile +++ b/luci-app-navidrome/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.1-20231208 +PKG_VERSION:=1.0.1-20240822 PKG_RELEASE:= LUCI_TITLE:=LuCI support for Navidrome diff --git a/luci-app-navidrome/root/usr/libexec/istorec/navidrome.sh b/luci-app-navidrome/root/usr/libexec/istorec/navidrome.sh index 1c079c8ab..31551bee9 100755 --- a/luci-app-navidrome/root/usr/libexec/istorec/navidrome.sh +++ b/luci-app-navidrome/root/usr/libexec/istorec/navidrome.sh @@ -63,10 +63,10 @@ case ${ACTION} in docker ${ACTION} navidrome ;; "status") - docker ps --all -f 'name=navidrome' --format '{{.State}}' + docker ps --all -f 'name=^/navidrome$' --format '{{.State}}' ;; "port") - docker ps --all -f 'name=navidrome' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' + docker ps --all -f 'name=^/navidrome$' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' ;; *) usage diff --git a/luci-app-nextcloud/Makefile b/luci-app-nextcloud/Makefile index ab1d3f46e..7de91d20d 100644 --- a/luci-app-nextcloud/Makefile +++ b/luci-app-nextcloud/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.1.1-20231208 +PKG_VERSION:=1.1.1-20240822 PKG_RELEASE:= LUCI_TITLE:=LuCI support for nextcloud diff --git a/luci-app-nextcloud/root/usr/libexec/istorec/nextcloud.sh b/luci-app-nextcloud/root/usr/libexec/istorec/nextcloud.sh index 4e7f8e827..c210ca5c7 100755 --- a/luci-app-nextcloud/root/usr/libexec/istorec/nextcloud.sh +++ b/luci-app-nextcloud/root/usr/libexec/istorec/nextcloud.sh @@ -72,10 +72,10 @@ case ${ACTION} in docker ${ACTION} nextcloud ;; "status") - docker ps --all -f 'name=nextcloud' --format '{{.State}}' + docker ps --all -f 'name=^/nextcloud$' --format '{{.State}}' ;; "port") - docker ps --all -f 'name=nextcloud' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' + docker ps --all -f 'name=^/nextcloud$' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' ;; *) usage diff --git a/luci-app-owntone/Makefile b/luci-app-owntone/Makefile index 43d58b9ca..212823532 100644 --- a/luci-app-owntone/Makefile +++ b/luci-app-owntone/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.2-20231208 +PKG_VERSION:=1.0.2-20240822 PKG_RELEASE:= LUCI_TITLE:=LuCI support for Owntone diff --git a/luci-app-owntone/root/usr/libexec/istorec/owntone.sh b/luci-app-owntone/root/usr/libexec/istorec/owntone.sh index 89e46fcd8..304f06106 100755 --- a/luci-app-owntone/root/usr/libexec/istorec/owntone.sh +++ b/luci-app-owntone/root/usr/libexec/istorec/owntone.sh @@ -60,7 +60,7 @@ case ${ACTION} in docker ${ACTION} owntone ;; "status") - docker ps --all -f 'name=owntone' --format '{{.State}}' + docker ps --all -f 'name=^/owntone$' --format '{{.State}}' ;; "port") echo 3689 diff --git a/luci-app-penpot/Makefile b/luci-app-penpot/Makefile index d7a4d76b0..d6323bd11 100644 --- a/luci-app-penpot/Makefile +++ b/luci-app-penpot/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.0-20221122 +PKG_VERSION:=1.0.0-20240822 PKG_RELEASE:= LUCI_TITLE:=LuCI support for Penpot diff --git a/luci-app-penpot/root/usr/libexec/istorec/penpot.sh b/luci-app-penpot/root/usr/libexec/istorec/penpot.sh index 93d8a53f4..5b41ce55d 100755 --- a/luci-app-penpot/root/usr/libexec/istorec/penpot.sh +++ b/luci-app-penpot/root/usr/libexec/istorec/penpot.sh @@ -60,7 +60,7 @@ case ${ACTION} in cd $config && docker-compose ${ACTION} ;; "status") - docker ps --all -f 'name=penpot_penpot-frontend_1' --format '{{.State}}' + docker ps --all -f 'name=^/penpot_penpot-frontend_1$' --format '{{.State}}' ;; "port") uci get -q penpot.@main[0].http_port 2>/dev/null diff --git a/luci-app-photoprism/Makefile b/luci-app-photoprism/Makefile index 3a676ae79..c04dac353 100644 --- a/luci-app-photoprism/Makefile +++ b/luci-app-photoprism/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.3-20231208 +PKG_VERSION:=1.0.3-20240822 PKG_RELEASE:= LUCI_TITLE:=LuCI support for PhotoPrism diff --git a/luci-app-photoprism/root/usr/libexec/istorec/photoprism.sh b/luci-app-photoprism/root/usr/libexec/istorec/photoprism.sh index cef19acef..fa5adf565 100755 --- a/luci-app-photoprism/root/usr/libexec/istorec/photoprism.sh +++ b/luci-app-photoprism/root/usr/libexec/istorec/photoprism.sh @@ -64,10 +64,10 @@ case ${ACTION} in docker ${ACTION} photoprism ;; "status") - docker ps --all -f 'name=photoprism' --format '{{.State}}' + docker ps --all -f 'name=^/photoprism$' --format '{{.State}}' ;; "port") - docker ps --all -f 'name=photoprism' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*->2342/tcp' | sed 's/0.0.0.0:\([0-9]*\)->.*/\1/' + docker ps --all -f 'name=^/photoprism$' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*->2342/tcp' | sed 's/0.0.0.0:\([0-9]*\)->.*/\1/' ;; *) usage diff --git a/luci-app-plex/Makefile b/luci-app-plex/Makefile index 8b4ea61e6..ce9b9c2d2 100644 --- a/luci-app-plex/Makefile +++ b/luci-app-plex/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.2-20231208 +PKG_VERSION:=1.0.2-20240822 PKG_RELEASE:= LUCI_TITLE:=LuCI support for Plex diff --git a/luci-app-plex/root/usr/libexec/istorec/plex.sh b/luci-app-plex/root/usr/libexec/istorec/plex.sh index 29561a228..fbedd9d88 100755 --- a/luci-app-plex/root/usr/libexec/istorec/plex.sh +++ b/luci-app-plex/root/usr/libexec/istorec/plex.sh @@ -95,10 +95,10 @@ case ${ACTION} in docker ${ACTION} plex ;; "status") - docker ps --all -f 'name=plex' --format '{{.State}}' + docker ps --all -f 'name=^/plex$' --format '{{.State}}' ;; "port") - docker ps --all -f 'name=plex' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*->32400/tcp' | sed 's/0.0.0.0:\([0-9]*\)->.*/\1/' + docker ps --all -f 'name=^/plex$' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*->32400/tcp' | sed 's/0.0.0.0:\([0-9]*\)->.*/\1/' ;; *) usage diff --git a/luci-app-typecho/Makefile b/luci-app-typecho/Makefile index 5587d56bc..b3d3c8219 100644 --- a/luci-app-typecho/Makefile +++ b/luci-app-typecho/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.2-20240313 +PKG_VERSION:=1.0.2-20240822 PKG_RELEASE:= LUCI_TITLE:=LuCI support for TypeCho diff --git a/luci-app-typecho/root/usr/libexec/istorec/typecho.sh b/luci-app-typecho/root/usr/libexec/istorec/typecho.sh index ea539188d..83b6ddb37 100755 --- a/luci-app-typecho/root/usr/libexec/istorec/typecho.sh +++ b/luci-app-typecho/root/usr/libexec/istorec/typecho.sh @@ -63,10 +63,10 @@ case ${ACTION} in docker ${ACTION} typecho ;; "status") - docker ps --all -f 'name=typecho' --format '{{.State}}' + docker ps --all -f 'name=^/typecho$' --format '{{.State}}' ;; "port") - docker ps --all -f 'name=typecho' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*->9080/tcp' | sed 's/0.0.0.0:\([0-9]*\)->.*/\1/' + docker ps --all -f 'name=^/typecho$' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*->9080/tcp' | sed 's/0.0.0.0:\([0-9]*\)->.*/\1/' ;; *) usage diff --git a/luci-app-ubuntu/Makefile b/luci-app-ubuntu/Makefile index 3a605076b..5adf75410 100644 --- a/luci-app-ubuntu/Makefile +++ b/luci-app-ubuntu/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.1.1-20231208 +PKG_VERSION:=1.1.1-20240822 PKG_RELEASE:= LUCI_TITLE:=LuCI support for ubuntu diff --git a/luci-app-ubuntu/root/usr/libexec/istorec/ubuntu.sh b/luci-app-ubuntu/root/usr/libexec/istorec/ubuntu.sh index 12ef5053d..58e745a6e 100755 --- a/luci-app-ubuntu/root/usr/libexec/istorec/ubuntu.sh +++ b/luci-app-ubuntu/root/usr/libexec/istorec/ubuntu.sh @@ -79,10 +79,10 @@ case ${ACTION} in docker ${ACTION} ubuntu ;; "status") - docker ps --all -f 'name=ubuntu' --format '{{.State}}' + docker ps --all -f 'name=^/ubuntu$' --format '{{.State}}' ;; "port") - docker ps --all -f 'name=ubuntu' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' + docker ps --all -f 'name=^/ubuntu$' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' ;; *) usage diff --git a/luci-app-unifi/Makefile b/luci-app-unifi/Makefile index d9f1850e9..e4c9960af 100644 --- a/luci-app-unifi/Makefile +++ b/luci-app-unifi/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.2-20231208 +PKG_VERSION:=1.0.2-20240822 PKG_RELEASE:= LUCI_TITLE:=LuCI support for UnifiController diff --git a/luci-app-unifi/root/usr/libexec/istorec/unifi.sh b/luci-app-unifi/root/usr/libexec/istorec/unifi.sh index 9fd3308da..a955fec25 100755 --- a/luci-app-unifi/root/usr/libexec/istorec/unifi.sh +++ b/luci-app-unifi/root/usr/libexec/istorec/unifi.sh @@ -72,10 +72,10 @@ case ${ACTION} in docker ${ACTION} unifi ;; "status") - docker ps --all -f 'name=unifi' --format '{{.State}}' + docker ps --all -f 'name=^/unifi$' --format '{{.State}}' ;; "port") - docker ps --all -f 'name=unifi' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*->8443/tcp' | sed 's/0.0.0.0:\([0-9]*\)->.*/\1/' + docker ps --all -f 'name=^/unifi$' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*->8443/tcp' | sed 's/0.0.0.0:\([0-9]*\)->.*/\1/' ;; *) usage diff --git a/luci-app-vaultwarden/Makefile b/luci-app-vaultwarden/Makefile index d73b09834..646081d40 100644 --- a/luci-app-vaultwarden/Makefile +++ b/luci-app-vaultwarden/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.1-20231208 +PKG_VERSION:=1.0.1-20240822 PKG_RELEASE:= LUCI_TITLE:=LuCI support for Vaultwarden diff --git a/luci-app-vaultwarden/root/usr/libexec/istorec/vaultwarden.sh b/luci-app-vaultwarden/root/usr/libexec/istorec/vaultwarden.sh index 1f52a1de5..af29cf0b3 100755 --- a/luci-app-vaultwarden/root/usr/libexec/istorec/vaultwarden.sh +++ b/luci-app-vaultwarden/root/usr/libexec/istorec/vaultwarden.sh @@ -72,7 +72,7 @@ case ${ACTION} in docker ${ACTION} vaultwarden ;; "status") - docker ps --all -f 'name=vaultwarden' --format '{{.State}}' + docker ps --all -f 'name=^/vaultwarden$' --format '{{.State}}' ;; "port") uci get -q vaultwarden.@main[0].http_port 2>/dev/null diff --git a/luci-app-webvirtcloud/Makefile b/luci-app-webvirtcloud/Makefile index 784569a90..b7b03fdb3 100644 --- a/luci-app-webvirtcloud/Makefile +++ b/luci-app-webvirtcloud/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=0.3.8-20230323-1 +PKG_VERSION:=0.3.8-20240822-1 PKG_RELEASE:= LUCI_TITLE:=LuCI support for webvirtcloud diff --git a/luci-app-webvirtcloud/root/usr/libexec/istorec/webvirtcloud.sh b/luci-app-webvirtcloud/root/usr/libexec/istorec/webvirtcloud.sh index 98b6e6fb1..bd6cc7962 100755 --- a/luci-app-webvirtcloud/root/usr/libexec/istorec/webvirtcloud.sh +++ b/luci-app-webvirtcloud/root/usr/libexec/istorec/webvirtcloud.sh @@ -98,10 +98,10 @@ case ${ACTION} in docker ${ACTION} webvirtcloud ;; "status") - docker ps --all -f 'name=webvirtcloud' --format '{{.State}}' + docker ps --all -f 'name=^/webvirtcloud$' --format '{{.State}}' ;; "port") - docker ps --all -f 'name=webvirtcloud' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' + docker ps --all -f 'name=^/webvirtcloud$' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' ;; "gpu-passthrough") do_gpu_passthrough diff --git a/luci-app-wxedge/Makefile b/luci-app-wxedge/Makefile index 32d69569f..cd1ff611d 100644 --- a/luci-app-wxedge/Makefile +++ b/luci-app-wxedge/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.1.3-20231208 +PKG_VERSION:=1.1.3-20240822 PKG_RELEASE:= LUCI_TITLE:=LuCI support for wxedge diff --git a/luci-app-wxedge/root/usr/libexec/istorec/wxedge.sh b/luci-app-wxedge/root/usr/libexec/istorec/wxedge.sh index f615d35c7..4049892c0 100755 --- a/luci-app-wxedge/root/usr/libexec/istorec/wxedge.sh +++ b/luci-app-wxedge/root/usr/libexec/istorec/wxedge.sh @@ -78,10 +78,10 @@ EOF docker ${ACTION} wxedge ;; "status") - docker ps --all -f 'name=wxedge' --format '{{.State}}' + docker ps --all -f 'name=^/wxedge$' --format '{{.State}}' ;; "port") - docker ps --all -f 'name=wxedge' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' + docker ps --all -f 'name=^/wxedge$' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' ;; *) usage diff --git a/luci-app-xteve/Makefile b/luci-app-xteve/Makefile index 3f8e7bcc3..4b2c15c91 100644 --- a/luci-app-xteve/Makefile +++ b/luci-app-xteve/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.2-20231208 +PKG_VERSION:=1.0.2-20240822 PKG_RELEASE:= LUCI_TITLE:=LuCI support for Xteve diff --git a/luci-app-xteve/root/usr/libexec/istorec/xteve.sh b/luci-app-xteve/root/usr/libexec/istorec/xteve.sh index fda794fb1..9558b991d 100755 --- a/luci-app-xteve/root/usr/libexec/istorec/xteve.sh +++ b/luci-app-xteve/root/usr/libexec/istorec/xteve.sh @@ -71,10 +71,10 @@ case ${ACTION} in docker ${ACTION} xteve ;; "status") - docker ps --all -f 'name=xteve' --format '{{.State}}' + docker ps --all -f 'name=^/xteve$' --format '{{.State}}' ;; "port") - docker ps --all -f 'name=xteve' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' + docker ps --all -f 'name=^/xteve$' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' ;; *) usage