Linkeasefull 0730 (#670)

Linkeasefull 0730 (#670)

  • add linkeasefull and linkease

  • linkeasefull update

  • update pkg release

  • linkeasefull version update

  • add istoreenhance and linkeasefull

  • add logo

  • remove linkeaselite


Co-authored-by: jannson <jannon.wei@gmail.com>
diff --git a/applications/app-meta-istoreenhance/Makefile b/applications/app-meta-istoreenhance/Makefile
index fd13942..559c9f9 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.5
+PKG_VERSION:=0.7.15
 PKG_RELEASE:=2
 META_TITLE:=KSpeeder(原iStore增强)
 META_TITLE.en:=KSpeeder(iStoreEnhance)
diff --git a/applications/app-meta-kaiplus/config.sh b/applications/app-meta-kaiplus/config.sh
index 485626b..748fb19 100644
--- a/applications/app-meta-kaiplus/config.sh
+++ b/applications/app-meta-kaiplus/config.sh
@@ -11,9 +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].port="8198"
+	set kaiplus.@kaiplus[0].port="8189"
+	set kaiplus.@kaiplus[0].base_path="/apps/kaiplus/"
 	set kaiplus.@kaiplus[0].system_role="istoreos"
 	commit kaiplus
 EOF
 
 /etc/init.d/kaiplus restart || true
+[ -x /etc/init.d/linkease ] && /etc/init.d/linkease restart >/dev/null 2>&1 &
diff --git a/applications/app-meta-kaiplus/entry.sh b/applications/app-meta-kaiplus/entry.sh
index 6b0f361..e514427 100644
--- a/applications/app-meta-kaiplus/entry.sh
+++ b/applications/app-meta-kaiplus/entry.sh
@@ -10,12 +10,23 @@ status(){
 
 	local port
 	port="$(uci get kaiplus.@kaiplus[0].port 2>/dev/null)"
-	local portsec=${port:-8198}
+	local portsec=${port:-8189}
+	local base_path
+	base_path="$(uci get kaiplus.@kaiplus[0].base_path 2>/dev/null)"
+	local basepath=${base_path:-/apps/kaiplus/}
+	case "$basepath" in
+		/*) ;;
+		*) basepath="/$basepath" ;;
+	esac
+	case "$basepath" in
+		*/) ;;
+		*) basepath="$basepath/" ;;
+	esac
 
 	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}/"
+		json_add_string "href" "http://$host:${portsec}${basepath}"
 		json_add_string "protocol" http
 		json_add_string "port" "${portsec}"
 		json_add_boolean "deployed" "1"
diff --git a/applications/app-meta-linkease/Makefile b/applications/app-meta-linkease/Makefile
index 60e7050..0727041 100644
--- a/applications/app-meta-linkease/Makefile
+++ b/applications/app-meta-linkease/Makefile
@@ -2,15 +2,15 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_VERSION:=1.7.5
-PKG_RELEASE:=4
+PKG_VERSION:=3.0.0
+PKG_RELEASE:=1
 META_TITLE:=易有云
 META_TITLE.en:=LinkEase
-META_DEPENDS:=+linkease +luci-app-linkease +luci-i18n-linkease-zh-cn
-META_DESCRIPTION:=易有云提供文件的外网访问,相册备份,文件同步,异地组网功能。需要配合电脑、手机客户端使用。
-META_DESCRIPTION.en:=LinkEase is a private cloud storage with its own remote connection to access personal files anytime, anywhere
+META_DEPENDS:=+linkease +linkease-common-bin +luci-app-linkease +luci-lib-linkeasefile +luci-i18n-linkease-zh-cn
+META_DESCRIPTION:=易有云提供远程访问、文件管理、相册备份、文件同步和备份仓库能力。
+META_DESCRIPTION.en:=LinkEase provides remote access, file management, photo backup, sync, and backup repository.
 META_AUTHOR:=xiaobao
-META_ARCH:=x86_64 aarch64
+META_ARCH:=x86_64 aarch64 arm
 META_TAGS:=nas service
 META_LUCI_ENTRY:=/cgi-bin/luci/admin/services/linkease
 META_WEBSITE:=https://www.linkease.com/
diff --git a/applications/app-meta-linkeasefull/Makefile b/applications/app-meta-linkeasefull/Makefile
new file mode 100644
index 0000000..0380522
--- /dev/null
+++ b/applications/app-meta-linkeasefull/Makefile
@@ -0,0 +1,21 @@
+# This is free software, licensed under the Apache License, Version 2.0 .
+
+include $(TOPDIR)/rules.mk
+
+PKG_VERSION:=3.0.11
+PKG_RELEASE:=1
+META_TITLE:=易有云完整版
+META_TITLE.en:=LinkEase Full
+META_DEPENDS:=+linkease-common-bin +linkeasefull +luci-app-linkeasefull +luci-lib-linkeasefile +luci-i18n-linkeasefull-zh-cn
+META_DESCRIPTION:=易有云完整版提供本地 Web 桌面和 8897 兼容入口,复用独立的易有云文件管理入口,运行时会停用标准版易有云。
+META_DESCRIPTION.en:=LinkEase Full provides the local web desktop and legacy 8897 entry, reuses the shared LinkEase file entry, and disables the standard LinkEase runtime while it runs.
+META_AUTHOR:=xiaobao
+META_ARCH:=x86_64 aarch64
+META_TAGS:=nas service
+META_LUCI_ENTRY:=/cgi-bin/luci/admin/services/linkeasefull
+META_WEBSITE:=https://www.linkease.com/
+META_TUTORIAL:=https://doc.linkease.com/zh/guide/istore/software/linkease.html
+
+include ../../meta.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/app-meta-linkeasefull/config.sh b/applications/app-meta-linkeasefull/config.sh
new file mode 100644
index 0000000..c96d793
--- /dev/null
+++ b/applications/app-meta-linkeasefull/config.sh
@@ -0,0 +1,6 @@
+uci -q batch <<-EOF >/dev/null || exit 1
+    set linkeasefull.@linkeasefull[0].enabled="1"
+    commit linkeasefull
+EOF
+
+/etc/init.d/linkeasefull restart
diff --git a/applications/app-meta-linkeasefull/logo.png b/applications/app-meta-linkeasefull/logo.png
new file mode 100644
index 0000000..81d650c
Binary files /dev/null and b/applications/app-meta-linkeasefull/logo.png differ

GitHub
sha: b5fc45cb7f0b1ee4831585094957386d32e04379