From f42c7607dd9e7607c635f2798e8084007eae0dd1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 8 Jan 2023 20:16:15 +0800 Subject: [PATCH] update 2023-01-08 20:16:15 --- .../applications/luci-app-chinesesubfinder/Makefile | 2 +- .../root/usr/libexec/istorec/chinesesubfinder.sh | 2 +- openwrt-app-actions/applications/luci-app-codeserver/Makefile | 2 +- .../root/usr/libexec/istorec/codeserver.sh | 2 +- openwrt-app-actions/applications/luci-app-emby/Makefile | 2 +- .../luci-app-emby/root/usr/libexec/istorec/emby.sh | 2 +- openwrt-app-actions/applications/luci-app-gogs/Makefile | 2 +- .../luci-app-gogs/root/usr/libexec/istorec/gogs.sh | 2 +- openwrt-app-actions/applications/luci-app-heimdall/Makefile | 2 +- .../luci-app-heimdall/root/usr/libexec/istorec/heimdall.sh | 2 +- .../applications/luci-app-homeassistant/Makefile | 2 +- .../root/usr/libexec/istorec/homeassistant.sh | 2 +- openwrt-app-actions/applications/luci-app-jackett/Makefile | 2 +- .../luci-app-jackett/root/usr/libexec/istorec/jackett.sh | 2 +- openwrt-app-actions/applications/luci-app-jellyfin/Makefile | 2 +- .../luci-app-jellyfin/root/usr/libexec/istorec/jellyfin.sh | 2 +- .../applications/luci-app-kodexplorer/Makefile | 2 +- .../root/usr/libexec/istorec/kodexplorer.sh | 2 +- openwrt-app-actions/applications/luci-app-lanraragi/Makefile | 2 +- .../luci-app-lanraragi/root/usr/libexec/istorec/lanraragi.sh | 2 +- openwrt-app-actions/applications/luci-app-memos/Makefile | 2 +- .../luci-app-memos/root/usr/libexec/istorec/memos.sh | 2 +- openwrt-app-actions/applications/luci-app-nastools/Makefile | 2 +- .../luci-app-nastools/root/usr/libexec/istorec/nastools.sh | 2 +- openwrt-app-actions/applications/luci-app-navidrome/Makefile | 2 +- .../luci-app-navidrome/root/usr/libexec/istorec/navidrome.sh | 2 +- openwrt-app-actions/applications/luci-app-nextcloud/Makefile | 2 +- .../luci-app-nextcloud/root/usr/libexec/istorec/nextcloud.sh | 2 +- openwrt-app-actions/applications/luci-app-owntone/Makefile | 2 +- .../luci-app-owntone/root/usr/libexec/istorec/owntone.sh | 2 +- openwrt-app-actions/applications/luci-app-photoprism/Makefile | 2 +- .../root/usr/libexec/istorec/photoprism.sh | 2 +- openwrt-app-actions/applications/luci-app-plex/Makefile | 2 +- .../luci-app-plex/root/usr/libexec/istorec/plex.sh | 2 +- openwrt-app-actions/applications/luci-app-ubuntu/Makefile | 2 +- .../luci-app-ubuntu/root/usr/libexec/istorec/ubuntu.sh | 2 +- openwrt-app-actions/applications/luci-app-unifi/Makefile | 2 +- .../luci-app-unifi/root/usr/libexec/istorec/unifi.sh | 2 +- .../applications/luci-app-vaultwarden/Makefile | 2 +- .../root/usr/libexec/istorec/vaultwarden.sh | 2 +- openwrt-app-actions/applications/luci-app-wxedge/Makefile | 2 +- .../luci-app-wxedge/root/usr/libexec/istorec/wxedge.sh | 2 +- openwrt-app-actions/applications/luci-app-xteve/Makefile | 2 +- .../luci-app-xteve/root/usr/libexec/istorec/xteve.sh | 2 +- openwrt-app-actions/applications/luci-app-xunlei/Makefile | 2 +- .../luci-app-xunlei/root/usr/libexec/istorec/xunlei.sh | 2 +- xray-plugin/Makefile | 4 ++-- 47 files changed, 48 insertions(+), 48 deletions(-) diff --git a/openwrt-app-actions/applications/luci-app-chinesesubfinder/Makefile b/openwrt-app-actions/applications/luci-app-chinesesubfinder/Makefile index 07272731f..23ec3a1f8 100644 --- a/openwrt-app-actions/applications/luci-app-chinesesubfinder/Makefile +++ b/openwrt-app-actions/applications/luci-app-chinesesubfinder/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.0-20221111 +PKG_VERSION:=1.0.1-20230108 PKG_RELEASE:= LUCI_TITLE:=LuCI support for ChineseSubFinder diff --git a/openwrt-app-actions/applications/luci-app-chinesesubfinder/root/usr/libexec/istorec/chinesesubfinder.sh b/openwrt-app-actions/applications/luci-app-chinesesubfinder/root/usr/libexec/istorec/chinesesubfinder.sh index 58bc559ff..92b1b6205 100755 --- a/openwrt-app-actions/applications/luci-app-chinesesubfinder/root/usr/libexec/istorec/chinesesubfinder.sh +++ b/openwrt-app-actions/applications/luci-app-chinesesubfinder/root/usr/libexec/istorec/chinesesubfinder.sh @@ -29,7 +29,7 @@ do_install() { --log-driver \"json-file\" \ --log-opt \"max-size=100m\" " - local tz="`cat /tmp/TZ`" + local tz="`uci get system.@system[0].zonename`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" [ -z "$media" ] || cmd="$cmd -v \"$media:/media\"" diff --git a/openwrt-app-actions/applications/luci-app-codeserver/Makefile b/openwrt-app-actions/applications/luci-app-codeserver/Makefile index 712645369..9369a1319 100644 --- a/openwrt-app-actions/applications/luci-app-codeserver/Makefile +++ b/openwrt-app-actions/applications/luci-app-codeserver/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.0-20221121 +PKG_VERSION:=1.0.1-20230108 PKG_RELEASE:= LUCI_TITLE:=LuCI support for CodeServer diff --git a/openwrt-app-actions/applications/luci-app-codeserver/root/usr/libexec/istorec/codeserver.sh b/openwrt-app-actions/applications/luci-app-codeserver/root/usr/libexec/istorec/codeserver.sh index bb1a999b8..b38afcc1e 100755 --- a/openwrt-app-actions/applications/luci-app-codeserver/root/usr/libexec/istorec/codeserver.sh +++ b/openwrt-app-actions/applications/luci-app-codeserver/root/usr/libexec/istorec/codeserver.sh @@ -31,7 +31,7 @@ do_install() { -e DEFAULT_WORKSPACE=/config/workspace \ -p $http_port:8443 " - local tz="`cat /tmp/TZ`" + local tz="`uci get system.@system[0].zonename`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" [ -z "$env_password" ] || cmd="$cmd -e \"PASSWORD=$env_password\"" diff --git a/openwrt-app-actions/applications/luci-app-emby/Makefile b/openwrt-app-actions/applications/luci-app-emby/Makefile index 7c46df62f..6c662d8cf 100644 --- a/openwrt-app-actions/applications/luci-app-emby/Makefile +++ b/openwrt-app-actions/applications/luci-app-emby/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.0-20221118 +PKG_VERSION:=1.0.1-20230108 PKG_RELEASE:= LUCI_TITLE:=LuCI support for Emby diff --git a/openwrt-app-actions/applications/luci-app-emby/root/usr/libexec/istorec/emby.sh b/openwrt-app-actions/applications/luci-app-emby/root/usr/libexec/istorec/emby.sh index 443915d7d..1bfa94b0a 100755 --- a/openwrt-app-actions/applications/luci-app-emby/root/usr/libexec/istorec/emby.sh +++ b/openwrt-app-actions/applications/luci-app-emby/root/usr/libexec/istorec/emby.sh @@ -43,7 +43,7 @@ do_install() { -p $http_port:8096 " fi - local tz="`cat /tmp/TZ`" + local tz="`uci get system.@system[0].zonename`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" [ -z "$cache" ] || cmd="$cmd -v \"$cache:/config/cache\"" diff --git a/openwrt-app-actions/applications/luci-app-gogs/Makefile b/openwrt-app-actions/applications/luci-app-gogs/Makefile index 1f1bd006c..6c662d8cf 100644 --- a/openwrt-app-actions/applications/luci-app-gogs/Makefile +++ b/openwrt-app-actions/applications/luci-app-gogs/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.0-20221114 +PKG_VERSION:=1.0.1-20230108 PKG_RELEASE:= LUCI_TITLE:=LuCI support for Emby diff --git a/openwrt-app-actions/applications/luci-app-gogs/root/usr/libexec/istorec/gogs.sh b/openwrt-app-actions/applications/luci-app-gogs/root/usr/libexec/istorec/gogs.sh index d9cf4f94d..e2f45858b 100755 --- a/openwrt-app-actions/applications/luci-app-gogs/root/usr/libexec/istorec/gogs.sh +++ b/openwrt-app-actions/applications/luci-app-gogs/root/usr/libexec/istorec/gogs.sh @@ -32,7 +32,7 @@ do_install() { -p $http_port:3000 \ -p $ssh_port:22 " - local tz="`cat /tmp/TZ`" + local tz="`uci get system.@system[0].zonename`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" cmd="$cmd -v /mnt:/mnt" diff --git a/openwrt-app-actions/applications/luci-app-heimdall/Makefile b/openwrt-app-actions/applications/luci-app-heimdall/Makefile index bc5ffd306..226812d68 100644 --- a/openwrt-app-actions/applications/luci-app-heimdall/Makefile +++ b/openwrt-app-actions/applications/luci-app-heimdall/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.1.0-20220830 +PKG_VERSION:=1.1.1-20230108 PKG_RELEASE:= LUCI_TITLE:=LuCI support for heimdall diff --git a/openwrt-app-actions/applications/luci-app-heimdall/root/usr/libexec/istorec/heimdall.sh b/openwrt-app-actions/applications/luci-app-heimdall/root/usr/libexec/istorec/heimdall.sh index de02e5e80..905043b23 100755 --- a/openwrt-app-actions/applications/luci-app-heimdall/root/usr/libexec/istorec/heimdall.sh +++ b/openwrt-app-actions/applications/luci-app-heimdall/root/usr/libexec/istorec/heimdall.sh @@ -38,7 +38,7 @@ do_install_detail() { cmd="$cmd -v /mnt:/mnt" mountpoint -q /mnt && cmd="$cmd:rslave" - local tz="`cat /tmp/TZ`" + local tz="`uci get system.@system[0].zonename`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" cmd="$cmd --name heimdall \"$IMAGE_NAME\"" diff --git a/openwrt-app-actions/applications/luci-app-homeassistant/Makefile b/openwrt-app-actions/applications/luci-app-homeassistant/Makefile index e610f95fc..766d78413 100644 --- a/openwrt-app-actions/applications/luci-app-homeassistant/Makefile +++ b/openwrt-app-actions/applications/luci-app-homeassistant/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.1.0-20221126 +PKG_VERSION:=1.1.1-20230108 PKG_RELEASE:= LUCI_TITLE:=LuCI support for homeassistant diff --git a/openwrt-app-actions/applications/luci-app-homeassistant/root/usr/libexec/istorec/homeassistant.sh b/openwrt-app-actions/applications/luci-app-homeassistant/root/usr/libexec/istorec/homeassistant.sh index 0e141ce6b..aaa9362d5 100755 --- a/openwrt-app-actions/applications/luci-app-homeassistant/root/usr/libexec/istorec/homeassistant.sh +++ b/openwrt-app-actions/applications/luci-app-homeassistant/root/usr/libexec/istorec/homeassistant.sh @@ -24,7 +24,7 @@ do_install() { --dns=127.0.0.1 " if [ -z "$tz" ]; then - tz="`cat /tmp/TZ`" + tz="`uci get system.@system[0].zonename`" fi [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" diff --git a/openwrt-app-actions/applications/luci-app-jackett/Makefile b/openwrt-app-actions/applications/luci-app-jackett/Makefile index 520284c43..5ba5cc2fe 100644 --- a/openwrt-app-actions/applications/luci-app-jackett/Makefile +++ b/openwrt-app-actions/applications/luci-app-jackett/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.1.0-20220718 +PKG_VERSION:=1.1.1-20230108 PKG_RELEASE:= LUCI_TITLE:=LuCI support for jackett diff --git a/openwrt-app-actions/applications/luci-app-jackett/root/usr/libexec/istorec/jackett.sh b/openwrt-app-actions/applications/luci-app-jackett/root/usr/libexec/istorec/jackett.sh index bf4d30b89..81edb46ad 100755 --- a/openwrt-app-actions/applications/luci-app-jackett/root/usr/libexec/istorec/jackett.sh +++ b/openwrt-app-actions/applications/luci-app-jackett/root/usr/libexec/istorec/jackett.sh @@ -32,7 +32,7 @@ do_install() { --dns=172.17.0.1 \ -p $port:9117 " - local tz="`cat /tmp/TZ`" + local tz="`uci get system.@system[0].zonename`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" if [ -n "$auto_update" ]; then diff --git a/openwrt-app-actions/applications/luci-app-jellyfin/Makefile b/openwrt-app-actions/applications/luci-app-jellyfin/Makefile index 5c9f2ebd6..89bb85066 100644 --- a/openwrt-app-actions/applications/luci-app-jellyfin/Makefile +++ b/openwrt-app-actions/applications/luci-app-jellyfin/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.1.6-20221125 +PKG_VERSION:=1.1.7-20230108 PKG_RELEASE:= LUCI_TITLE:=LuCI support for jellyfin diff --git a/openwrt-app-actions/applications/luci-app-jellyfin/root/usr/libexec/istorec/jellyfin.sh b/openwrt-app-actions/applications/luci-app-jellyfin/root/usr/libexec/istorec/jellyfin.sh index 31af9c7d3..07dd51419 100755 --- a/openwrt-app-actions/applications/luci-app-jellyfin/root/usr/libexec/istorec/jellyfin.sh +++ b/openwrt-app-actions/applications/luci-app-jellyfin/root/usr/libexec/istorec/jellyfin.sh @@ -100,7 +100,7 @@ do_install_detail() { -p $port:8096 " fi - local tz="`cat /tmp/TZ`" + local tz="`uci get system.@system[0].zonename`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" [ -z "$cache" ] || cmd="$cmd -v \"$cache:/config/transcodes\"" diff --git a/openwrt-app-actions/applications/luci-app-kodexplorer/Makefile b/openwrt-app-actions/applications/luci-app-kodexplorer/Makefile index cfba9d858..daa95f6b3 100644 --- a/openwrt-app-actions/applications/luci-app-kodexplorer/Makefile +++ b/openwrt-app-actions/applications/luci-app-kodexplorer/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.2.0-20221212 +PKG_VERSION:=1.2.1-20230108 PKG_RELEASE:= LUCI_TITLE:=LuCI support for kodexplorer diff --git a/openwrt-app-actions/applications/luci-app-kodexplorer/root/usr/libexec/istorec/kodexplorer.sh b/openwrt-app-actions/applications/luci-app-kodexplorer/root/usr/libexec/istorec/kodexplorer.sh index 77652eeab..90136bf78 100755 --- a/openwrt-app-actions/applications/luci-app-kodexplorer/root/usr/libexec/istorec/kodexplorer.sh +++ b/openwrt-app-actions/applications/luci-app-kodexplorer/root/usr/libexec/istorec/kodexplorer.sh @@ -39,7 +39,7 @@ do_install() { cmd="$cmd -v /mnt:/mnt" mountpoint -q /mnt && cmd="$cmd:rslave" - local tz="`cat /tmp/TZ`" + local tz="`uci get system.@system[0].zonename`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" cmd="$cmd --name kodexplorer \"$IMAGE_NAME\"" diff --git a/openwrt-app-actions/applications/luci-app-lanraragi/Makefile b/openwrt-app-actions/applications/luci-app-lanraragi/Makefile index 797c12e98..7327cf8ea 100644 --- a/openwrt-app-actions/applications/luci-app-lanraragi/Makefile +++ b/openwrt-app-actions/applications/luci-app-lanraragi/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.0-20221119 +PKG_VERSION:=1.0.1-20230108 PKG_RELEASE:= LUCI_TITLE:=LuCI support for LANraragi diff --git a/openwrt-app-actions/applications/luci-app-lanraragi/root/usr/libexec/istorec/lanraragi.sh b/openwrt-app-actions/applications/luci-app-lanraragi/root/usr/libexec/istorec/lanraragi.sh index 918f74dca..6647d9134 100755 --- a/openwrt-app-actions/applications/luci-app-lanraragi/root/usr/libexec/istorec/lanraragi.sh +++ b/openwrt-app-actions/applications/luci-app-lanraragi/root/usr/libexec/istorec/lanraragi.sh @@ -28,7 +28,7 @@ do_install() { --dns=172.17.0.1 \ -p $http_port:3000 " - local tz="`cat /tmp/TZ`" + local tz="`uci get system.@system[0].zonename`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" cmd="$cmd -v /mnt:/mnt" diff --git a/openwrt-app-actions/applications/luci-app-memos/Makefile b/openwrt-app-actions/applications/luci-app-memos/Makefile index 997354ae3..f9b7d5527 100644 --- a/openwrt-app-actions/applications/luci-app-memos/Makefile +++ b/openwrt-app-actions/applications/luci-app-memos/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.0-20221118 +PKG_VERSION:=1.0.1-20230108 PKG_RELEASE:= LUCI_TITLE:=LuCI support for Memos diff --git a/openwrt-app-actions/applications/luci-app-memos/root/usr/libexec/istorec/memos.sh b/openwrt-app-actions/applications/luci-app-memos/root/usr/libexec/istorec/memos.sh index a3bb56419..78fe5e4c3 100755 --- a/openwrt-app-actions/applications/luci-app-memos/root/usr/libexec/istorec/memos.sh +++ b/openwrt-app-actions/applications/luci-app-memos/root/usr/libexec/istorec/memos.sh @@ -27,7 +27,7 @@ do_install() { --dns=172.17.0.1 \ -p $http_port:5230 " - local tz="`cat /tmp/TZ`" + local tz="`uci get system.@system[0].zonename`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" cmd="$cmd -v /mnt:/mnt" diff --git a/openwrt-app-actions/applications/luci-app-nastools/Makefile b/openwrt-app-actions/applications/luci-app-nastools/Makefile index b3c3d7467..2c51c4086 100644 --- a/openwrt-app-actions/applications/luci-app-nastools/Makefile +++ b/openwrt-app-actions/applications/luci-app-nastools/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.1.1-20221110 +PKG_VERSION:=1.1.2-20230108 PKG_RELEASE:= LUCI_TITLE:=LuCI support for nastools diff --git a/openwrt-app-actions/applications/luci-app-nastools/root/usr/libexec/istorec/nastools.sh b/openwrt-app-actions/applications/luci-app-nastools/root/usr/libexec/istorec/nastools.sh index ad8fdcb8e..aeb705a5a 100755 --- a/openwrt-app-actions/applications/luci-app-nastools/root/usr/libexec/istorec/nastools.sh +++ b/openwrt-app-actions/applications/luci-app-nastools/root/usr/libexec/istorec/nastools.sh @@ -35,7 +35,7 @@ do_install_detail() { -p $port:3000 \ -e UMASK=000" - local tz="`cat /tmp/TZ`" + local tz="`uci get system.@system[0].zonename`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" if [ -n "$auto_update" ]; then diff --git a/openwrt-app-actions/applications/luci-app-navidrome/Makefile b/openwrt-app-actions/applications/luci-app-navidrome/Makefile index 9977dc432..45cf1ca37 100644 --- a/openwrt-app-actions/applications/luci-app-navidrome/Makefile +++ b/openwrt-app-actions/applications/luci-app-navidrome/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.0-20221119 +PKG_VERSION:=1.0.1-20230108 PKG_RELEASE:= LUCI_TITLE:=LuCI support for Navidrome diff --git a/openwrt-app-actions/applications/luci-app-navidrome/root/usr/libexec/istorec/navidrome.sh b/openwrt-app-actions/applications/luci-app-navidrome/root/usr/libexec/istorec/navidrome.sh index 4a1e71bfb..984ea8c5d 100755 --- a/openwrt-app-actions/applications/luci-app-navidrome/root/usr/libexec/istorec/navidrome.sh +++ b/openwrt-app-actions/applications/luci-app-navidrome/root/usr/libexec/istorec/navidrome.sh @@ -28,7 +28,7 @@ do_install() { --dns=172.17.0.1 \ -p $http_port:4533 " - local tz="`cat /tmp/TZ`" + local tz="`uci get system.@system[0].zonename`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" cmd="$cmd -v /mnt:/mnt" diff --git a/openwrt-app-actions/applications/luci-app-nextcloud/Makefile b/openwrt-app-actions/applications/luci-app-nextcloud/Makefile index 808e904fe..dd99821f5 100644 --- a/openwrt-app-actions/applications/luci-app-nextcloud/Makefile +++ b/openwrt-app-actions/applications/luci-app-nextcloud/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.1.0-20220830 +PKG_VERSION:=1.1.1-20230108 PKG_RELEASE:= LUCI_TITLE:=LuCI support for nextcloud diff --git a/openwrt-app-actions/applications/luci-app-nextcloud/root/usr/libexec/istorec/nextcloud.sh b/openwrt-app-actions/applications/luci-app-nextcloud/root/usr/libexec/istorec/nextcloud.sh index dec8b6eae..a04c802be 100755 --- a/openwrt-app-actions/applications/luci-app-nextcloud/root/usr/libexec/istorec/nextcloud.sh +++ b/openwrt-app-actions/applications/luci-app-nextcloud/root/usr/libexec/istorec/nextcloud.sh @@ -38,7 +38,7 @@ do_install() { cmd="$cmd -v /mnt:/mnt" mountpoint -q /mnt && cmd="$cmd:rslave" - local tz="`cat /tmp/TZ`" + local tz="`uci get system.@system[0].zonename`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" cmd="$cmd --name nextcloud \"$IMAGE_NAME\"" diff --git a/openwrt-app-actions/applications/luci-app-owntone/Makefile b/openwrt-app-actions/applications/luci-app-owntone/Makefile index ede50896f..680a5afb5 100644 --- a/openwrt-app-actions/applications/luci-app-owntone/Makefile +++ b/openwrt-app-actions/applications/luci-app-owntone/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.0-20221119 +PKG_VERSION:=1.0.1-20230108 PKG_RELEASE:= LUCI_TITLE:=LuCI support for Owntone diff --git a/openwrt-app-actions/applications/luci-app-owntone/root/usr/libexec/istorec/owntone.sh b/openwrt-app-actions/applications/luci-app-owntone/root/usr/libexec/istorec/owntone.sh index 9c0d47474..31d7352f1 100755 --- a/openwrt-app-actions/applications/luci-app-owntone/root/usr/libexec/istorec/owntone.sh +++ b/openwrt-app-actions/applications/luci-app-owntone/root/usr/libexec/istorec/owntone.sh @@ -25,7 +25,7 @@ do_install() { --dns=127.0.0.1 \ --network=host " - local tz="`cat /tmp/TZ`" + local tz="`uci get system.@system[0].zonename`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" cmd="$cmd -v /mnt:/mnt" diff --git a/openwrt-app-actions/applications/luci-app-photoprism/Makefile b/openwrt-app-actions/applications/luci-app-photoprism/Makefile index b783fa661..6a8f4b0e7 100644 --- a/openwrt-app-actions/applications/luci-app-photoprism/Makefile +++ b/openwrt-app-actions/applications/luci-app-photoprism/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.0-20221117 +PKG_VERSION:=1.0.1-20230108 PKG_RELEASE:= LUCI_TITLE:=LuCI support for PhotoPrism diff --git a/openwrt-app-actions/applications/luci-app-photoprism/root/usr/libexec/istorec/photoprism.sh b/openwrt-app-actions/applications/luci-app-photoprism/root/usr/libexec/istorec/photoprism.sh index eda78c35d..ce95d04a7 100755 --- a/openwrt-app-actions/applications/luci-app-photoprism/root/usr/libexec/istorec/photoprism.sh +++ b/openwrt-app-actions/applications/luci-app-photoprism/root/usr/libexec/istorec/photoprism.sh @@ -27,7 +27,7 @@ do_install() { -e PHOTOPRISM_UPLOAD_NSFW=\"true\" \ -e PHOTOPRISM_ADMIN_PASSWORD=\"$password\" " - local tz="`cat /tmp/TZ`" + local tz="`uci get system.@system[0].zonename`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" [ -z "$picture" ] || cmd="$cmd -v \"$picture:/photoprism/originals\"" diff --git a/openwrt-app-actions/applications/luci-app-plex/Makefile b/openwrt-app-actions/applications/luci-app-plex/Makefile index c855d9967..b3b4c2c4f 100644 --- a/openwrt-app-actions/applications/luci-app-plex/Makefile +++ b/openwrt-app-actions/applications/luci-app-plex/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.0-20221212 +PKG_VERSION:=1.0.1-20230108 PKG_RELEASE:= LUCI_TITLE:=LuCI support for Plex diff --git a/openwrt-app-actions/applications/luci-app-plex/root/usr/libexec/istorec/plex.sh b/openwrt-app-actions/applications/luci-app-plex/root/usr/libexec/istorec/plex.sh index 02e34ceb7..2b0f3e6da 100755 --- a/openwrt-app-actions/applications/luci-app-plex/root/usr/libexec/istorec/plex.sh +++ b/openwrt-app-actions/applications/luci-app-plex/root/usr/libexec/istorec/plex.sh @@ -54,7 +54,7 @@ do_install() { -p $port:32400 " fi - local tz="`cat /tmp/TZ`" + local tz="`uci get system.@system[0].zonename`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" [ -z "$claim_token" ] || cmd="$cmd -e \"PLEX_CLAIM=$claim_token\"" diff --git a/openwrt-app-actions/applications/luci-app-ubuntu/Makefile b/openwrt-app-actions/applications/luci-app-ubuntu/Makefile index ef2a1a6eb..275906a45 100644 --- a/openwrt-app-actions/applications/luci-app-ubuntu/Makefile +++ b/openwrt-app-actions/applications/luci-app-ubuntu/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.1.0-20221119 +PKG_VERSION:=1.1.1-20230108 PKG_RELEASE:= LUCI_TITLE:=LuCI support for ubuntu diff --git a/openwrt-app-actions/applications/luci-app-ubuntu/root/usr/libexec/istorec/ubuntu.sh b/openwrt-app-actions/applications/luci-app-ubuntu/root/usr/libexec/istorec/ubuntu.sh index 8b5a4e766..c66bf2401 100755 --- a/openwrt-app-actions/applications/luci-app-ubuntu/root/usr/libexec/istorec/ubuntu.sh +++ b/openwrt-app-actions/applications/luci-app-ubuntu/root/usr/libexec/istorec/ubuntu.sh @@ -44,7 +44,7 @@ do_install() { -e VNC_PW=${password} \ -e VNC_USE_HTTP=0 " - local tz="`cat /tmp/TZ`" + local tz="`uci get system.@system[0].zonename`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" cmd="$cmd -v /mnt:/mnt" diff --git a/openwrt-app-actions/applications/luci-app-unifi/Makefile b/openwrt-app-actions/applications/luci-app-unifi/Makefile index c4bca79f0..832d1e9f8 100644 --- a/openwrt-app-actions/applications/luci-app-unifi/Makefile +++ b/openwrt-app-actions/applications/luci-app-unifi/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.0-20221114 +PKG_VERSION:=1.0.1-20230108 PKG_RELEASE:= LUCI_TITLE:=LuCI support for UnifiController diff --git a/openwrt-app-actions/applications/luci-app-unifi/root/usr/libexec/istorec/unifi.sh b/openwrt-app-actions/applications/luci-app-unifi/root/usr/libexec/istorec/unifi.sh index d4cce3404..78ae5d264 100755 --- a/openwrt-app-actions/applications/luci-app-unifi/root/usr/libexec/istorec/unifi.sh +++ b/openwrt-app-actions/applications/luci-app-unifi/root/usr/libexec/istorec/unifi.sh @@ -37,7 +37,7 @@ do_install() { -p $http_port:8443 " fi - local tz="`cat /tmp/TZ`" + local tz="`uci get system.@system[0].zonename`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" cmd="$cmd -v /mnt:/mnt" diff --git a/openwrt-app-actions/applications/luci-app-vaultwarden/Makefile b/openwrt-app-actions/applications/luci-app-vaultwarden/Makefile index f47e3f6da..264e66315 100644 --- a/openwrt-app-actions/applications/luci-app-vaultwarden/Makefile +++ b/openwrt-app-actions/applications/luci-app-vaultwarden/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.0-20221118 +PKG_VERSION:=1.0.1-20230108 PKG_RELEASE:= LUCI_TITLE:=LuCI support for Vaultwarden diff --git a/openwrt-app-actions/applications/luci-app-vaultwarden/root/usr/libexec/istorec/vaultwarden.sh b/openwrt-app-actions/applications/luci-app-vaultwarden/root/usr/libexec/istorec/vaultwarden.sh index 73969d3f1..ea3fc8a32 100755 --- a/openwrt-app-actions/applications/luci-app-vaultwarden/root/usr/libexec/istorec/vaultwarden.sh +++ b/openwrt-app-actions/applications/luci-app-vaultwarden/root/usr/libexec/istorec/vaultwarden.sh @@ -37,7 +37,7 @@ do_install() { cmd="$cmd -e \"SIGNUPS_ALLOWED=false\"" fi - local tz="`cat /tmp/TZ`" + local tz="`uci get system.@system[0].zonename`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" cmd="$cmd -v /mnt:/mnt" diff --git a/openwrt-app-actions/applications/luci-app-wxedge/Makefile b/openwrt-app-actions/applications/luci-app-wxedge/Makefile index d90470243..f05a1f225 100644 --- a/openwrt-app-actions/applications/luci-app-wxedge/Makefile +++ b/openwrt-app-actions/applications/luci-app-wxedge/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.1.1-20221024 +PKG_VERSION:=1.1.2-20230108 PKG_RELEASE:= LUCI_TITLE:=LuCI support for wxedge diff --git a/openwrt-app-actions/applications/luci-app-wxedge/root/usr/libexec/istorec/wxedge.sh b/openwrt-app-actions/applications/luci-app-wxedge/root/usr/libexec/istorec/wxedge.sh index dc947fc95..55cbdd784 100755 --- a/openwrt-app-actions/applications/luci-app-wxedge/root/usr/libexec/istorec/wxedge.sh +++ b/openwrt-app-actions/applications/luci-app-wxedge/root/usr/libexec/istorec/wxedge.sh @@ -34,7 +34,7 @@ do_install_detail() { -v \"$path/containerd:/var/lib/containerd\" \ -e PLACE=CTKS" - local tz="`cat /tmp/TZ`" + local tz="`uci get system.@system[0].zonename`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" cmd="$cmd --name wxedge \"$IMAGE_NAME\"" diff --git a/openwrt-app-actions/applications/luci-app-xteve/Makefile b/openwrt-app-actions/applications/luci-app-xteve/Makefile index 25f36b8e6..9e8c7d638 100644 --- a/openwrt-app-actions/applications/luci-app-xteve/Makefile +++ b/openwrt-app-actions/applications/luci-app-xteve/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.0-20221213 +PKG_VERSION:=1.0.1-20230108 PKG_RELEASE:= LUCI_TITLE:=LuCI support for Xteve diff --git a/openwrt-app-actions/applications/luci-app-xteve/root/usr/libexec/istorec/xteve.sh b/openwrt-app-actions/applications/luci-app-xteve/root/usr/libexec/istorec/xteve.sh index 09679decf..aa95d8e20 100755 --- a/openwrt-app-actions/applications/luci-app-xteve/root/usr/libexec/istorec/xteve.sh +++ b/openwrt-app-actions/applications/luci-app-xteve/root/usr/libexec/istorec/xteve.sh @@ -37,7 +37,7 @@ do_install() { -p $port:34400 " if [ -z "$tz" ]; then - tz="`cat /tmp/TZ`" + tz="`uci get system.@system[0].zonename`" fi [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" diff --git a/openwrt-app-actions/applications/luci-app-xunlei/Makefile b/openwrt-app-actions/applications/luci-app-xunlei/Makefile index 72487b9d3..beedf587a 100644 --- a/openwrt-app-actions/applications/luci-app-xunlei/Makefile +++ b/openwrt-app-actions/applications/luci-app-xunlei/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=1.0.0-20221117 +PKG_VERSION:=1.0.1-20230108 PKG_RELEASE:= LUCI_TITLE:=LuCI support for Xunlei diff --git a/openwrt-app-actions/applications/luci-app-xunlei/root/usr/libexec/istorec/xunlei.sh b/openwrt-app-actions/applications/luci-app-xunlei/root/usr/libexec/istorec/xunlei.sh index 63a41706b..35d07b4ca 100755 --- a/openwrt-app-actions/applications/luci-app-xunlei/root/usr/libexec/istorec/xunlei.sh +++ b/openwrt-app-actions/applications/luci-app-xunlei/root/usr/libexec/istorec/xunlei.sh @@ -37,7 +37,7 @@ do_install() { -p $port:2345 " fi - local tz="`cat /tmp/TZ`" + local tz="`uci get system.@system[0].zonename`" [ -z "$tz" ] || cmd="$cmd -e TZ=$tz" cmd="$cmd --name xunlei \"$image_name\"" diff --git a/xray-plugin/Makefile b/xray-plugin/Makefile index 29d0ce87b..5e2c71c49 100644 --- a/xray-plugin/Makefile +++ b/xray-plugin/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xray-plugin -PKG_VERSION:=1.7.0 +PKG_VERSION:=1.7.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/teddysun/xray-plugin/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=5b0fc7d346361e1439eb6bf1e21393606bf1a753a2c9e07265d5933ada40b264 +PKG_HASH:=01436a239a4f3b2d9365d77fa43292f6d89c676b2bc0d5e933635cc613b63f0f PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE