diff --git a/install.sh b/install.sh index f8dacda2..a741d9ce 100644 --- a/install.sh +++ b/install.sh @@ -13,7 +13,10 @@ NC='\033[0m' # Configuration CONFIG_DIR="/etc/sing-box" -CONFIG_FILE="$CONFIG_DIR/config.json" +CONFIG_MERGE_DIR="$CONFIG_DIR/config.d" +CONFIG_BASE_FILE="$CONFIG_MERGE_DIR/10-base.json" +CONFIG_OUTBOUNDS_FILE="$CONFIG_MERGE_DIR/20-outbounds.json" +WORK_DIR="/var/lib/sing-box" BINARY_PATH="/usr/local/bin/sing-box" SERVICE_NAME="ganclient" SERVICE_FILE="/etc/systemd/system/${SERVICE_NAME}.service" @@ -38,7 +41,8 @@ esac # Prepare directories mkdir -p "$CONFIG_DIR" -mkdir -p "/var/lib/sing-box" +mkdir -p "$CONFIG_MERGE_DIR" +mkdir -p "$WORK_DIR" # Check and Install Go install_go() { @@ -241,7 +245,7 @@ SERVICE_JSON+=$'\n }' # Generate Configuration echo -e "${YELLOW}Generating configuration...${NC}" -cat > "$CONFIG_FILE" < "$CONFIG_BASE_FILE" < "$CONFIG_FILE" < "$CONFIG_FILE" < "$CONFIG_OUTBOUNDS_FILE" <