From cdd3dbc51cc9d5b9e035ef8530852052a466fbd8 Mon Sep 17 00:00:00 2001
From: "Xinwei Xiong(cubxxw-openim)" <3293172751nss@gmail.com>
Date: Thu, 3 Aug 2023 18:05:57 +0800
Subject: [PATCH] fix: set branch

Signed-off-by: Xinwei Xiong(cubxxw-openim) <3293172751nss@gmail.com>
---
 init_docker.sh    | 44 --------------------------------------------
 install.sh        |  8 ++++----
 scripts/build.cmd | 23 ++++++++++++-----------
 3 files changed, 16 insertions(+), 59 deletions(-)
 delete mode 100755 init_docker.sh

diff --git a/init_docker.sh b/init_docker.sh
deleted file mode 100755
index b06eda469..000000000
--- a/init_docker.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env bash
-
-mark=''
-for ((ratio=0;${ratio}<=100;ratio+=5))
-do
-        sleep 0.2
-        printf "progress:[%-40s]%d%%\r" "${mark}" "${ratio}"
-        mark="##${mark}"
-done
-echo
-
-set -e
-
-# Change directory to the 'scripts' folder
-cd scripts
-
-# Grant execute permissions to all shell scripts in the 'scripts' folder
-chmod +x *.sh
-
-# Run the 'env_check.sh' script for environment checks
-./env_check.sh
-
-# Move back to the parent directory
-cd ..
-
-# Check if Docker is installed
-if ! command -v docker >/dev/null 2>&1; then
-  echo "Error: Docker is not installed. Please install Docker before running this script."
-  exit 1
-fi
-
-# Start Docker services using docker-compose
-if command -v docker-compose &> /dev/null
-then
-    docker-compose up -d
-else
-    docker compose up -d
-fi
-
-# Move back to the 'scripts' folder
-cd scripts
-
-# Run the 'docker_check_service.sh' script for Docker service checks
-./docker_check_service.sh
diff --git a/install.sh b/install.sh
index f9b9b7ec4..82756b4bb 100755
--- a/install.sh
+++ b/install.sh
@@ -20,7 +20,7 @@ set -e
 set -o pipefail
 
 
-############### OpenIM Github ###############
+############################## OpenIM Github ##############################
 # ... rest of the script ...
 
 # TODO
@@ -78,7 +78,7 @@ GITHUB_TOKEN=
 # Default data directory. If you want to specify a different directory, uncomment and replace "./".
 # DATA_DIR=./
 
-############### OpenIM Functions ###############
+############################## OpenIM Functions ##############################
 # Install horizon of the script
 #
 # Pre-requisites:
@@ -290,7 +290,7 @@ function install_openim() {
     success "OpenIM installation completed successfully. Happy chatting!"
 }
 
-############### OpenIM Help ###############
+############################## OpenIM Help ##############################
 
 # Function to display help message
 function cmd_help() {
@@ -406,7 +406,7 @@ function parseinput() {
     done
 }
 
-############### OpenIM LOGO ###############
+############################## OpenIM LOG ##############################
 # Set text color to cyan for header and URL
 print_with_delay() {
   text="$1"
diff --git a/scripts/build.cmd b/scripts/build.cmd
index f3c086a32..d153e6d9e 100644
--- a/scripts/build.cmd
+++ b/scripts/build.cmd
@@ -1,12 +1,13 @@
+@echo off
 set output_dir=%~dp0..\_output\bin\platforms\windows
-go build -o %output_dir%\api.exe ../cmd/openim-api/main.go
-go build -o %output_dir%\auth.exe ../cmd/openim-rpc/openim-rpc-auth/main.go
-go build -o %output_dir%\conversation.exe ../cmd/openim-rpc/openim-rpc-conversation/main.go
-go build -o %output_dir%\friend.exe ../cmd/openim-rpc/openim-rpc-friend/main.go
-go build -o %output_dir%\group.exe ../cmd/openim-rpc/openim-rpc-group/main.go
-go build -o %output_dir%\msg.exe ../cmd/openim-rpc/openim-rpc-msg/main.go
-go build -o %output_dir%\third.exe ../cmd/openim-rpc/openim-rpc-third/main.go
-go build -o %output_dir%\user.exe ../cmd/openim-rpc/openim-rpc-user/main.go
-go build -o %output_dir%\push.exe ../cmd/openim-push/main.go
-go build -o %output_dir%\msgtransfer.exe ../cmd/openim-msgtransfer/main.go
-go build -o %output_dir%\msggateway.exe ../cmd/openim-msggateway/main.go
\ No newline at end of file
+
+set "rpc_apps=auth conversation friend group msg third user"
+set "other_apps=api push msgtransfer msggateway"
+
+for %%a in (%rpc_apps%) do (
+    go build -o %output_dir%\%%a.exe ../cmd/openim-rpc/openim-rpc-%%a/main.go
+)
+
+for %%a in (%other_apps%) do (
+    go build -o %output_dir%\%%a.exe ../cmd/openim-%%a/main.go
+)