From dd48a57ddb22382c1422cebb6a96cc0964ff33e1 Mon Sep 17 00:00:00 2001
From: YuFengLiu <38746920+l2280212@users.noreply.github.com>
Date: Fri, 19 Jan 2024 15:06:17 +0800
Subject: [PATCH] Improve  some descriptions of daemon-script

---
 .../resources/sbin/daemon-confignode.sh        | 18 +++++++-----------
 .../assembly/resources/sbin/daemon-datanode.sh | 18 +++++++-----------
 .../resources/conf/iotdb-cluster.properties    |  2 +-
 3 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/iotdb-core/confignode/src/assembly/resources/sbin/daemon-confignode.sh b/iotdb-core/confignode/src/assembly/resources/sbin/daemon-confignode.sh
index 8c58905ae319..37c2328c481e 100644
--- a/iotdb-core/confignode/src/assembly/resources/sbin/daemon-confignode.sh
+++ b/iotdb-core/confignode/src/assembly/resources/sbin/daemon-confignode.sh
@@ -61,22 +61,18 @@ EOF
 echo "Daemon service of IoTDB ConfigNode has been successfully registered."
 
 systemctl daemon-reload
-
-echo "Do you want to start IoTDB ConfigNode ? y/n (default y)"
-echo "Or you can use 'systemctl start iotdb-confignode' to start it later."
+echo
+echo "Do you want to execute 'systemctl start iotdb-confignode'? y/n (default y)"
 read -r START_SERVICE
-echo - - - - - - - - - -
 if [[ -z "$START_SERVICE" || "$START_SERVICE" =~ ^[Yy]$ ]]; then
     "${IOTDB_SBIN_HOME}"/sbin/stop-confignode.sh >/dev/null 2>&1 &
     systemctl start iotdb-confignode
+    echo "Executed successfully."
 fi
-
-echo "Do you want to start IoTDB ConfigNode when system startup ? y/n (default y)"
-echo "Or you can use 'systemctl enable iotdb-confignode' to enable it later."
+echo
+echo "Do you want to execute 'systemctl enable iotdb-confignode' to start at boot? y/n (default y)"
 read -r ADD_STARTUP
-echo - - - - - - - - - -
 if [[ -z "$ADD_STARTUP" || "$ADD_STARTUP" =~ ^[Yy]$ ]]; then
-   systemctl enable iotdb-confignode
-else
-   systemctl disable iotdb-confignode
+   systemctl enable iotdb-confignode >/dev/null 2>&1
+   echo "Executed successfully."
 fi
\ No newline at end of file
diff --git a/iotdb-core/datanode/src/assembly/resources/sbin/daemon-datanode.sh b/iotdb-core/datanode/src/assembly/resources/sbin/daemon-datanode.sh
index fd8f9ffd8adf..0452bfdc8d10 100644
--- a/iotdb-core/datanode/src/assembly/resources/sbin/daemon-datanode.sh
+++ b/iotdb-core/datanode/src/assembly/resources/sbin/daemon-datanode.sh
@@ -61,22 +61,18 @@ EOF
 echo "Daemon service of IoTDB DataNode has been successfully registered."
 
 systemctl daemon-reload
-
-echo "Do you want to start IoTDB DataNode ? y/n (default y)"
-echo "Or you can use 'systemctl start iotdb-datanode' to start it later."
+echo
+echo "Do you want to execute 'systemctl start iotdb-datanode'? y/n (default y)"
 read -r START_SERVICE
-echo - - - - - - - - - -
 if [[ -z "$START_SERVICE" || "$START_SERVICE" =~ ^[Yy]$ ]]; then
     "${IOTDB_SBIN_HOME}"/sbin/stop-datanode.sh >/dev/null 2>&1 &
     systemctl start iotdb-datanode
+    echo "Executed successfully."
 fi
-
-echo "Do you want to start IoTDB DataNode when system startup ? y/n (default y)"
-echo "Or you can use 'systemctl enable iotdb-datanode' to enable it later."
+echo
+echo "Do you want to execute 'systemctl enable iotdb-datanode' to start at boot? y/n (default y)"
 read -r ADD_STARTUP
-echo - - - - - - - - - -
 if [[ -z "$ADD_STARTUP" || "$ADD_STARTUP" =~ ^[Yy]$ ]]; then
-   systemctl enable iotdb-datanode
-else
-   systemctl disable iotdb-datanode
+   systemctl enable iotdb-datanode >/dev/null 2>&1
+   echo "Executed successfully."
 fi
\ No newline at end of file
diff --git a/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-cluster.properties b/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-cluster.properties
index 3661551c69d5..b565be09867b 100644
--- a/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-cluster.properties
+++ b/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-cluster.properties
@@ -28,6 +28,6 @@ datanode_address_list=
 ssh_account=root
 # ssh login port
 ssh_port=22
-# iotdb deployment directory (iotdb will be deployed to the target node in this folder)
+# iotdb deployment directory (iotdb should be deployed to the following folders in all machines)
 confignode_deploy_path=
 datanode_deploy_path=
\ No newline at end of file