From 61a3de38565d61bd59cbf1b037f1e4d85af7ef45 Mon Sep 17 00:00:00 2001
From: Darren <27513732@qq.com>
Date: Fri, 6 Oct 2023 18:59:47 +0800
Subject: [PATCH] fix

---
 changelog_latest.md        | 4 ++--
 install/install.sh         | 4 ++--
 install/install_cockpit.sh | 6 +++---
 version.json               | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/changelog_latest.md b/changelog_latest.md
index 57d5af55..759d22c3 100644
--- a/changelog_latest.md
+++ b/changelog_latest.md
@@ -1,2 +1,2 @@
-1. Fix install error: apt locked
-2. Install: add Docker daemon.json
+1. Fix install error: print version at Ubuntu
+2. Fix install error: cockpit can not start at Ubuntu
diff --git a/install/install.sh b/install/install.sh
index ad222bf2..5e1fa29b 100644
--- a/install/install.sh
+++ b/install/install.sh
@@ -120,7 +120,7 @@ install_tools(){
 
 
 download_source() {
-    echo_prefix_source=$'\n[Dowload Source] - '
+    echo_prefix_source=$'\n[Download Source] - '
     echo "$echo_prefix_source Download Websoft9 source code from $artifact_url/$source_zip"
     
     find . -type f -name "websoft9*.zip*" -exec rm -f {} \;
@@ -290,7 +290,7 @@ install_systemd() {
     sudo mkdir -p "$systemd_path"
     fi
 
-    sudo cp -r $install_path/systemd/* "$systemd_path"
+    sudo cp -r $install_path/systemd/script/* "$systemd_path"
     sudo cp -f "$systemd_path/websoft9.service" /lib/systemd/system/
     if [ $? -ne 0 ]; then
         echo "Failed to copy Systemd service file."
diff --git a/install/install_cockpit.sh b/install/install_cockpit.sh
index 165e2729..c008529a 100644
--- a/install/install_cockpit.sh
+++ b/install/install_cockpit.sh
@@ -102,7 +102,7 @@ check_ports() {
 }
 
 Print_Version(){
-    sudo /usr/libexec/cockpit-ws --version 2>/dev/null || sudo /usr/lib/cockpit-ws --version 2>/dev/null
+    sudo /usr/libexec/cockpit-ws --version 2>/dev/null || sudo /usr/lib/cockpit-ws --version 2>/dev/null || /usr/lib/cockpit/cockpit-ws --version 2>/dev/null
 }
 
 Install_PackageKit(){
@@ -132,7 +132,7 @@ Install_PackageKit(){
 
 
 Set_Repository() {
-    echo "$echo_prefix_cockpit Set Cockpit repository"
+    echo "$echo_prefix_cockpit Set Cockpit deb repository"
     if command -v apt &> /dev/null; then
         if [ "$NAME" = "Debian" ]; then
             echo "deb http://deb.debian.org/debian $VERSION_CODENAME-backports main" > /etc/apt/sources.list.d/backports.list
@@ -147,8 +147,8 @@ Set_Repository() {
 Restart_Cockpit(){
     echo "$echo_prefix_cockpit Restart Cockpit"
     sudo systemctl daemon-reload
-    sudo systemctl restart cockpit
     sudo systemctl restart cockpit.socket 2> /dev/null
+    sudo systemctl restart cockpit
 }
 
 Set_Firewall(){
diff --git a/version.json b/version.json
index 3ed5b367..0fff21f7 100644
--- a/version.json
+++ b/version.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.8.26-rc4",
+  "version": "0.8.26-rc5",
   "plugins": {
     "portainer": "0.0.6",
     "nginx": "0.0.5",