Ubuntu 1.0.7 (#435)

* fix ubuntu2 * butter for ubuntu --------- Co-authored-by: janson <[email protected]>
linkease · Dec 16, 2024 · c92c8cb · c92c8cb
1 parent eea23d0
commit c92c8cb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/applications/app-meta-ubuntu/Makefile b/applications/app-meta-ubuntu/Makefile
@@ -2,7 +2,7 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_VERSION:=1.0.7
+PKG_VERSION:=1.0.8
 PKG_RELEASE:=20241216
 META_TITLE:=Ubuntu
 META_DEPENDS:=+luci-app-ubuntu2 +luci-i18n-ubuntu-zh-cn +docker-deps
@@ -12,6 +12,7 @@ META_TAGS:=system tool
 META_LUCI_ENTRY:=/cgi-bin/luci/admin/services/ubuntu2
 META_WEBSITE:=https://www.kasmweb.com
 META_TUTORIAL:=https://doc.linkease.com/zh/guide/easepi/advanced.html\#ubuntu
+META_AUTOCONF:=path enable
 
 include ../../meta.mk
 

diff --git a/applications/app-meta-ubuntu/config.sh b/applications/app-meta-ubuntu/config.sh
@@ -1,17 +1,12 @@
 
 [ -z "$ISTORE_CONF_DIR" ] && exit 1
-[ -z "$ISTORE_CACHE_DIR" ] && exit 1
 
 uci -q batch <<-EOF >/dev/null || exit 1
-    set ubuntu2.@ubuntu2[0].config_path="$ISTORE_CONF_DIR/Ubuntu2"
+    set ubuntu2.@main[0].config_path="$ISTORE_CONF_DIR/Ubuntu2"
     commit ubuntu2
 EOF
 
 ISTORE_ACTION=install
 [ -z "$ISTORE_DONT_START" ] || ISTORE_ACTION=stop
 
-if [ -f /usr/libexec/istorec/ubuntu2.sh ]; then
-    /usr/libexec/istorec/ubuntu2.sh $ISTORE_ACTION
-else
-    /usr/share/ubuntu2/install.sh $ISTORE_ACTION
-fi
+/usr/libexec/istorec/ubuntu2.sh $ISTORE_ACTION