From 0d4f7e4f280f20f5b91064c78990249bb3845109 Mon Sep 17 00:00:00 2001
From: tuend-work <121396415+tuend-work@users.noreply.github.com>
Date: Thu, 13 Nov 2025 11:39:36 +0700
Subject: [PATCH] a

---
 directadmin-1.62.4/scripts/install.sh | 13 ++++++++++---
 setup.sh                              | 19 ++++++++++---------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/directadmin-1.62.4/scripts/install.sh b/directadmin-1.62.4/scripts/install.sh
index d21da0c..e3a7d9d 100644
--- a/directadmin-1.62.4/scripts/install.sh
+++ b/directadmin-1.62.4/scripts/install.sh
@@ -401,7 +401,7 @@ getServices() {
 	servfile=`cat ./setup.txt | grep services= | cut -d= -f2`;
 
 	#get the md5sum
-	wget https://raw.githubusercontent.com/irf1404/Directadmin/master/services/${servfile}.md5 -O ${SERVICES_FILE}.md5
+	wget https://git.wpcloud.vn/tuend/DirectAdmin-1.62.4/raw/branch/main/services/${servfile}.md5 -O ${SERVICES_FILE}.md5
 	if [ ! -s ${SERVICES_FILE}.md5 ];
 	then
 		echo "";
@@ -410,7 +410,7 @@ getServices() {
 		sleep 4;
 	fi
 
-	wget https://raw.githubusercontent.com/irf1404/Directadmin/master/services/${servfile} -O $SERVICES_FILE
+	wget https://git.wpcloud.vn/tuend/DirectAdmin-1.62.4/raw/branch/main/services/${servfile} -O $SERVICES_FILE
 	if [ $? -ne 0 ]
 	then
 		echo "Error downloading the services file";
@@ -454,7 +454,10 @@ ${DA_SCRIPTS}/cron_deny.sh
 touch /root/.skip_get_license
 echo "Chạy getLicense"
 getLicense
+
+echo "-------------------------------------------------------------"
 echo "Chạy getServices"
+echo "-------------------------------------------------------------"
 getServices
 
 if [ ! -e ${DA_PATH}/custombuild/options.conf ] && [ -e /etc/redhat-release ] && [ ! -e /etc/init.d/xinetd ] && [ -e /usr/bin/yum ]; then
@@ -507,7 +510,11 @@ ${DA_SCRIPTS}/sysbk.sh
 
 echo "Chạy ./build all d"
 cd ${DA_PATH}/custombuild
-echo "Bắt đầu build....."
+
+echo "-------------------------------------------------------------"
+echo "Bắt đầu build..... "
+echo "-------------------------------------------------------------"
+
 chmod 755 build
 ./build update_script
 ./build update
diff --git a/setup.sh b/setup.sh
index 648266e..29245c1 100644
--- a/setup.sh
+++ b/setup.sh
@@ -334,15 +334,15 @@ clean_dev()
 echo "";
 echo "DirectAdmin will now be installed on: $OS $OS_VER";
 
-if [ $CMD_LINE -eq 0 ]; then
-	echo -n "Is this correct? (must match license) (y,n) : ";
-	read yesno;
+# if [ $CMD_LINE -eq 0 ]; then
+	# echo -n "Is this correct? (must match license) (y,n) : ";
+	# read yesno;
 
-	if [ "$yesno" = "n" ]; then
-		echo -e "\nPlease change the value in your license, or install the correct operating system\n";
-		exit 1;
-	fi
-fi
+	# if [ "$yesno" = "n" ]; then
+		# echo -e "\nPlease change the value in your license, or install the correct operating system\n";
+		# exit 1;
+	# fi
+# fi
 
 # Hexan
 PWD_DIR=`pwd`
@@ -777,8 +777,9 @@ chmod 600 $SETUP
 # Install it
 
 cd $SCRIPTS_PATH;
-
+echo "-----------------"
 echo "Chạy ./install.sh $CMD_LINE"
+echo "-----------------"
 ./install.sh $CMD_LINE
 
 RET=$?