Merge commit '8cdf8e566d9c238fa2d7706c8af8930d35eb0a60' into only_luci

linkease · Nov 15, 2024 · c5f7e6f · c5f7e6f
2 parents 289de27 + 8cdf8e5
commit c5f7e6f
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/applications/luci-app-arcadia/Makefile b/applications/luci-app-arcadia/Makefile
@@ -2,7 +2,7 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_VERSION:=0.0.1-1
+PKG_VERSION:=0.0.2-1
 PKG_RELEASE:=
 
 LUCI_TITLE:=LuCI support for arcadia

diff --git a/applications/luci-app-arcadia/luasrc/model/cbi/arcadia.lua b/applications/luci-app-arcadia/luasrc/model/cbi/arcadia.lua
@@ -11,7 +11,8 @@ m = taskd.docker_map("arcadia", "arcadia", "/usr/libexec/istorec/arcadia.sh",
 	translate("Arcadia one-stop code operation and maintenance platform.")
 		.. translate("Official website:") .. ' <a href=\"https://arcadia.cool\" target=\"_blank\">https://arcadia.cool</a>'
 		.. "<dl><dt>" .. translate("Arcadia is mainly aimed at scripting language programming and is suitable for development and operation environments of small and medium-sized teams and individuals.") .. "</dt>"
-		.. translate("In addition to code maintenance, Arcadia is also a powerful scheduled task maintenance platform with a comprehensive file system and underlying CLI command design.")
+		.. "<dt>" .. translate("In addition to code maintenance, Arcadia is also a powerful scheduled task maintenance platform with a comprehensive file system and underlying CLI command design.") .. "</dt>"
+		.. "<dt>" .. translate("The initial username and password are 'useradmin' and 'passwd' respectively.") .. "</dt>"
 		.. "</dl>")
 
 s = m:section(SimpleSection, translate("Service Status"), translate("Arcadia status:"))

diff --git a/applications/luci-app-arcadia/po/zh-cn/arcadia.po b/applications/luci-app-arcadia/po/zh-cn/arcadia.po
@@ -13,6 +13,9 @@ msgstr "Arcadia 主要面向于脚本语言编程，适用于中小型团队与
 msgid "In addition to code maintenance, Arcadia is also a powerful scheduled task maintenance platform with a comprehensive file system and underlying CLI command design."
 msgstr "除了代码运维外 Arcadia 还是一个强大的定时任务运维平台，并且有着完善的文件系统和底层CLI命令设计。"
 
+msgid "The initial username and password are 'useradmin' and 'passwd' respectively."
+msgstr "初始的用户名和密码分别是'useradmin'和'passwd'。"
+
 msgid "Image"
 msgstr "镜像"
 

diff --git a/applications/luci-app-arcadia/root/usr/libexec/istorec/arcadia.sh b/applications/luci-app-arcadia/root/usr/libexec/istorec/arcadia.sh
@@ -38,11 +38,6 @@ do_install_detail() {
   [ -z "$port" ] && port=5678
 
   local cmd="docker run --restart=unless-stopped -d -v \"$config/config:/arcadia/config\" -v \"$config/log:/arcadia/log\" -v \"$config/scripts:/arcadia/scripts\" -v \"$config/repo:/arcadia/repo\" -v \"$config/raw:/arcadia/raw\" -v \"$config/tgbot:/arcadia/tgbot\" "
-  if [ -d /dev/dri ]; then
-    cmd="$cmd\
-    -v /dev/dri:/dev/dri \
-    --privileged "
-  fi
   if [ "$hostnet" = 1 ]; then
     cmd="$cmd\
     --dns=127.0.0.1 \

diff --git a/applications/luci-app-systools/Makefile b/applications/luci-app-systools/Makefile
@@ -2,7 +2,7 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_VERSION:=1.0.5-20240624
+PKG_VERSION:=1.0.6-20241113
 PKG_RELEASE:=
 
 LUCI_TITLE:=LuCI support for SysTools

diff --git a/applications/luci-app-systools/root/usr/share/systools/istore-reinstall.run b/applications/luci-app-systools/root/usr/share/systools/istore-reinstall.run
@@ -1,5 +1,5 @@
 #!/bin/sh
-ISTORE_REPO=https://istore.linkease.com/repo/all/store
+ISTORE_REPO=https://istore.istoreos.com/repo/all/store
 FCURL="curl --fail --show-error"
 
 curl -V >/dev/null 2>&1 || {