upgrade linkeasefull 3.0.16 (#680)
Co-authored-by: jannson <jannon.wei@gmail.com>
diff --git a/applications/app-meta-baidudrive/Makefile b/applications/app-meta-baidudrive/Makefile
index 80435fa..eaaae15 100644
--- a/applications/app-meta-baidudrive/Makefile
+++ b/applications/app-meta-baidudrive/Makefile
@@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk
-PKG_VERSION:=1.0.5
+PKG_VERSION:=1.0.6
PKG_RELEASE:=1
META_TITLE:=百度网盘
META_TITLE.en:=BaiduDrive
diff --git a/applications/app-meta-ddnsto/root/usr/share/linkeasefull/app-meta/ddnsto/logo.png b/applications/app-meta-ddnsto/root/usr/share/linkeasefull/app-meta/ddnsto/logo.png
new file mode 120000
index 0000000..71049a5
--- /dev/null
+++ b/applications/app-meta-ddnsto/root/usr/share/linkeasefull/app-meta/ddnsto/logo.png
@@ -0,0 +1 @@
+/www/luci-static/resources/app-icons/ddnsto.png
\ No newline at end of file
diff --git a/applications/app-meta-ddnsto/root/usr/share/linkeasefull/desktop-apps.d/16-ddnsto.json b/applications/app-meta-ddnsto/root/usr/share/linkeasefull/desktop-apps.d/16-ddnsto.json
new file mode 100644
index 0000000..8563643
--- /dev/null
+++ b/applications/app-meta-ddnsto/root/usr/share/linkeasefull/desktop-apps.d/16-ddnsto.json
@@ -0,0 +1,46 @@
+{
+ "schemaVersion": 1,
+ "id": "ddnsto",
+ "name": "DDNSTO",
+ "icon": "logo.png",
+ "staticRoot": "/usr/share/linkeasefull/app-meta/ddnsto",
+ "desktop": {
+ "mode": "builtin",
+ "component": "LuciContainer",
+ "props": {
+ "initialPath": "/cgi-bin/luci/admin/services/ddnsto",
+ "contentOnly": true,
+ "isolation": "scoped-dom-css",
+ "mountIds": [
+ "root",
+ "app"
+ ],
+ "hideChrome": true,
+ "preloadScripts": [
+ "/luci-static/linkeasefull-embed/embed-prelude.js"
+ ],
+ "preloadStyles": [
+ "/luci-static/linkeasefull-embed/embed.css"
+ ]
+ }
+ },
+ "standalone": {
+ "url": "/cgi-bin/luci/admin/services/ddnsto"
+ },
+ "window": {
+ "width": 980,
+ "height": 700,
+ "singleton": true
+ },
+ "capabilities": [
+ "ddnsto",
+ "openwrt",
+ "luci",
+ "network"
+ ],
+ "categories": [
+ "network",
+ "service",
+ "openwrt"
+ ]
+}
diff --git a/applications/app-meta-dockermanager/config.sh b/applications/app-meta-dockermanager/config.sh
index 70e1e83..556db4a 100644
--- a/applications/app-meta-dockermanager/config.sh
+++ b/applications/app-meta-dockermanager/config.sh
@@ -10,6 +10,9 @@ mkdir -p "$ISTORE_CONF_DIR/DockerManager" || exit 1
uci -q batch <<-EOF >/dev/null || exit 1
set dockermanager.@dockermanager[0].enabled=$ENABLED
set dockermanager.@dockermanager[0].data_dir="$ISTORE_CONF_DIR/DockerManager"
+ set dockermanager.@dockermanager[0].listen_mode="auto"
+ set dockermanager.@dockermanager[0].external_port_enabled="0"
+ set dockermanager.@dockermanager[0].socket_path="/var/run/dockermanager.sock"
set dockermanager.@dockermanager[0].port="8192"
set dockermanager.@dockermanager[0].bind_addr="0.0.0.0"
set dockermanager.@dockermanager[0].base_path="/apps/dockermanager/"
diff --git a/applications/app-meta-dockermanager/entry.sh b/applications/app-meta-dockermanager/entry.sh
index b9f3f5b..15f3d41 100644
--- a/applications/app-meta-dockermanager/entry.sh
+++ b/applications/app-meta-dockermanager/entry.sh
@@ -11,26 +11,33 @@ status(){
local port
port="$(uci get dockermanager.@dockermanager[0].port 2>/dev/null)"
local portsec=${port:-8192}
- local base_path
- base_path="$(uci get dockermanager.@dockermanager[0].base_path 2>/dev/null)"
- local basepath=${base_path:-/apps/dockermanager/}
- case "$basepath" in
- /*) ;;
- *) basepath="/$basepath" ;;
+ local base_path
+ base_path="$(uci get dockermanager.@dockermanager[0].base_path 2>/dev/null)"
+ local basepath=${base_path:-/apps/dockermanager/}
+ local external_port_enabled
+ external_port_enabled="$(uci get dockermanager.@dockermanager[0].external_port_enabled 2>/dev/null)"
+ case "$basepath" in
+ /*) ;;
+ *) basepath="/$basepath" ;;
esac
case "$basepath" in
*/) ;;
*) basepath="$basepath/" ;;
esac
- if pidof docker-manager >/dev/null 2>&1; then
- json_add_boolean "running" "1"
- json_add_string "web" ":${portsec}"
- json_add_string "href" "http://$host:${portsec}${basepath}"
- json_add_string "protocol" http
- json_add_string "port" "${portsec}"
- json_add_boolean "deployed" "1"
- else
+ if pidof docker-manager >/dev/null 2>&1; then
+ json_add_boolean "running" "1"
+ if [ "$external_port_enabled" = "1" ]; then
+ json_add_string "web" ":${portsec}"
+ json_add_string "href" "http://$host:${portsec}${basepath}"
+ json_add_string "port" "${portsec}"
+ else
+ json_add_string "web" "${basepath}"
+ json_add_string "href" "/cgi-bin/luci/admin/services/dockermanager/open"
+ fi
+ json_add_string "protocol" http
+ json_add_boolean "deployed" "1"
+ else
json_add_boolean "running" "0"
if [ -x /etc/init.d/dockermanager ]; then
json_add_boolean "deployed" "1"
diff --git a/applications/app-meta-istoreenhance/Makefile b/applications/app-meta-istoreenhance/Makefile
index 8b596d2..6b46347 100644
--- a/applications/app-meta-istoreenhance/Makefile
+++ b/applications/app-meta-istoreenhance/Makefile
@@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk
-PKG_VERSION:=0.7.16
+PKG_VERSION:=0.7.17
PKG_RELEASE:=1
META_TITLE:=KSpeeder(原iStore增强)
META_TITLE.en:=KSpeeder(iStoreEnhance)
diff --git a/applications/app-meta-kaiplus/Makefile b/applications/app-meta-kaiplus/Makefile
index df9fcc1..dc1b5b2 100644
--- a/applications/app-meta-kaiplus/Makefile
+++ b/applications/app-meta-kaiplus/Makefile
@@ -12,7 +12,7 @@ META_DESCRIPTION.en:=KaiPlus AI workspace
META_AUTHOR:=koolcenter
META_ARCH:=x86_64 aarch64
META_TAGS:=system ai
-META_LUCI_ENTRY:=/cgi-bin/luci/admin/services/kaiplus
+META_LUCI_ENTRY:=/cgi-bin/luci/admin/services/kaiplus/open
META_WEBSITE:=https://ai.koolcenter.com
META_AUTOCONF:=path enable
META_UCI:=kaiplus
diff --git a/applications/app-meta-kaiplus/config.sh b/applications/app-meta-kaiplus/config.sh
index 748fb19..0954709 100644
--- a/applications/app-meta-kaiplus/config.sh
+++ b/applications/app-meta-kaiplus/config.sh
@@ -11,7 +11,11 @@ mkdir -p "$ISTORE_CONF_DIR/KAIPlus" || exit 1
uci -q batch <<-EOF >/dev/null || exit 1
set kaiplus.@kaiplus[0].enabled=$ENABLED
set kaiplus.@kaiplus[0].data_dir="$ISTORE_CONF_DIR/KAIPlus"
+ set kaiplus.@kaiplus[0].listen_mode="auto"
+ set kaiplus.@kaiplus[0].external_port_enabled="0"
+ set kaiplus.@kaiplus[0].socket_path="/var/run/kaiplus.sock"
set kaiplus.@kaiplus[0].port="8189"
+ set kaiplus.@kaiplus[0].bind_addr="0.0.0.0"
set kaiplus.@kaiplus[0].base_path="/apps/kaiplus/"
set kaiplus.@kaiplus[0].system_role="istoreos"
commit kaiplus
diff --git a/applications/app-meta-kaiplus/entry.sh b/applications/app-meta-kaiplus/entry.sh
index e514427..2ef0dc6 100644
--- a/applications/app-meta-kaiplus/entry.sh
+++ b/applications/app-meta-kaiplus/entry.sh
@@ -14,6 +14,8 @@ status(){
local base_path
base_path="$(uci get kaiplus.@kaiplus[0].base_path 2>/dev/null)"
local basepath=${base_path:-/apps/kaiplus/}
+ local external_port_enabled
+ external_port_enabled="$(uci get kaiplus.@kaiplus[0].external_port_enabled 2>/dev/null)"
case "$basepath" in
/*) ;;
*) basepath="/$basepath" ;;
@@ -25,10 +27,15 @@ status(){
if pidof kaiplus_bin >/dev/null 2>&1; then
json_add_boolean "running" "1"
- json_add_string "web" ":${portsec}"
- json_add_string "href" "http://$host:${portsec}${basepath}"
+ if [ "$external_port_enabled" = "1" ]; then
+ json_add_string "web" ":${portsec}"
+ json_add_string "href" "http://$host:${portsec}${basepath}"
+ json_add_string "port" "${portsec}"
+ else
+ json_add_string "web" "${basepath}"
+ json_add_string "href" "/cgi-bin/luci/admin/services/kaiplus/open"
+ fi
json_add_string "protocol" http
- json_add_string "port" "${portsec}"
json_add_boolean "deployed" "1"
else
json_add_boolean "running" "0"
[... diff too long, it was truncated ...]
GitHub
sha: 3e155809a05bc62ebc1f6e3745d6c7cb863601d2