From 6c5486eafc37699327eef6c4ed7a45111289b6e3 Mon Sep 17 00:00:00 2001
From: Whispering Wind <151555003+ReturnFI@users.noreply.github.com>
Date: Sat, 17 May 2025 23:20:04 +0330
Subject: [PATCH] feat: Add function to edit Normalsub subpath

This commit introduces a new 'edit_subpath' command to the
normalsub.sh script. This allows users to change the SUBPATH
variable in the .env file and automatically restarts the
hysteria-normal-sub service to apply the changes.
---
 core/scripts/normalsub/normalsub.sh | 58 +++++++++++++++++++++++------
 1 file changed, 47 insertions(+), 11 deletions(-)

diff --git a/core/scripts/normalsub/normalsub.sh b/core/scripts/normalsub/normalsub.sh
index a02b6ae..ceae80f 100644
--- a/core/scripts/normalsub/normalsub.sh
+++ b/core/scripts/normalsub/normalsub.sh
@@ -70,7 +70,6 @@ start_service() {
     systemctl daemon-reload
     systemctl enable hysteria-normal-sub.service > /dev/null 2>&1
     systemctl start hysteria-normal-sub.service > /dev/null 2>&1
-    # systemctl restart caddy.service > /dev/null 2>&1 # We stopped caddy service just after its installation
     systemctl daemon-reload > /dev/null 2>&1
 
     if systemctl is-active --quiet hysteria-normal-sub.service; then
@@ -85,12 +84,12 @@ stop_service() {
         source /etc/hysteria/core/scripts/normalsub/.env
     fi
 
-    # if [ -n "$HYSTERIA_DOMAIN" ]; then
-    #     echo -e "${yellow}Deleting SSL certificate for domain: $HYSTERIA_DOMAIN...${NC}"
-    #     certbot delete --cert-name "$HYSTERIA_DOMAIN" --non-interactive > /dev/null 2>&1
-    # else
-    #     echo -e "${red}HYSTERIA_DOMAIN not found in .env. Skipping certificate deletion.${NC}"
-    # fi
+    if [ -n "$HYSTERIA_DOMAIN" ]; then
+        echo -e "${yellow}Deleting SSL certificate for domain: $HYSTERIA_DOMAIN...${NC}"
+        certbot delete --cert-name "$HYSTERIA_DOMAIN" --non-interactive > /dev/null 2>&1
+    else
+        echo -e "${red}HYSTERIA_DOMAIN not found in .env. Skipping certificate deletion.${NC}"
+    fi
 
     systemctl stop hysteria-normal-sub.service > /dev/null 2>&1
     systemctl disable hysteria-normal-sub.service > /dev/null 2>&1
@@ -101,6 +100,38 @@ stop_service() {
     echo -e "${yellow}normalsub service stopped and disabled. .env file removed.${NC}"
 }
 
+edit_subpath() {
+    local new_path="$1"
+    local env_file="/etc/hysteria/core/scripts/normalsub/.env"
+
+    if [[ ! "$new_path" =~ ^[a-zA-Z0-9]+$ ]]; then
+        echo -e "${red}Error: New subpath must contain only alphanumeric characters (a-z, A-Z, 0-9) and cannot be empty.${NC}"
+        exit 1
+    fi
+
+    if [ ! -f "$env_file" ]; then
+        echo -e "${red}Error: .env file ($env_file) not found. Please run the start command first.${NC}"
+        exit 1
+    fi
+
+    if grep -q "^SUBPATH=" "$env_file"; then
+        sed -i "s|^SUBPATH=.*|SUBPATH=$new_path|" "$env_file"
+    else
+        echo "SUBPATH=$new_path" >> "$env_file"
+    fi
+    echo -e "${green}SUBPATH updated to $new_path in $env_file.${NC}"
+
+    echo -e "${yellow}Restarting hysteria-normal-sub service...${NC}"
+    systemctl daemon-reload
+    systemctl restart hysteria-normal-sub.service
+
+    if systemctl is-active --quiet hysteria-normal-sub.service; then
+        echo -e "${green}hysteria-normal-sub service restarted successfully.${NC}"
+    else
+        echo -e "${red}Error: hysteria-normal-sub service failed to restart. Please check logs.${NC}"
+    fi
+}
+
 case "$1" in
     start)
         if [ -z "$2" ] || [ -z "$3" ]; then
@@ -112,10 +143,15 @@ case "$1" in
     stop)
         stop_service
         ;;
+    edit_subpath)
+        if [ -z "$2" ]; then
+            echo -e "${red}Usage: $0 edit_subpath <NEW_SUBPATH> ${NC}"
+            exit 1
+        fi
+        edit_subpath "$2"
+        ;;
     *)
-        echo -e "${red}Usage: $0 {start|stop} <DOMAIN> <PORT> ${NC}"
+        echo -e "${red}Usage: $0 {start <DOMAIN> <PORT> | stop | edit_subpath <NEW_SUBPATH>} ${NC}"
         exit 1
         ;;
-esac
-
-define_colors
+esac
\ No newline at end of file