This commit is contained in:
tuend-work
2025-11-13 11:39:36 +07:00
parent a1cb058090
commit 0d4f7e4f28
2 changed files with 20 additions and 12 deletions

View File

@@ -401,7 +401,7 @@ getServices() {
servfile=`cat ./setup.txt | grep services= | cut -d= -f2`; servfile=`cat ./setup.txt | grep services= | cut -d= -f2`;
#get the md5sum #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 ]; if [ ! -s ${SERVICES_FILE}.md5 ];
then then
echo ""; echo "";
@@ -410,7 +410,7 @@ getServices() {
sleep 4; sleep 4;
fi 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 ] if [ $? -ne 0 ]
then then
echo "Error downloading the services file"; echo "Error downloading the services file";
@@ -454,7 +454,10 @@ ${DA_SCRIPTS}/cron_deny.sh
touch /root/.skip_get_license touch /root/.skip_get_license
echo "Chạy getLicense" echo "Chạy getLicense"
getLicense getLicense
echo "-------------------------------------------------------------"
echo "Chạy getServices" echo "Chạy getServices"
echo "-------------------------------------------------------------"
getServices getServices
if [ ! -e ${DA_PATH}/custombuild/options.conf ] && [ -e /etc/redhat-release ] && [ ! -e /etc/init.d/xinetd ] && [ -e /usr/bin/yum ]; then 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" echo "Chạy ./build all d"
cd ${DA_PATH}/custombuild cd ${DA_PATH}/custombuild
echo "Bắt đầu build....."
echo "-------------------------------------------------------------"
echo "Bắt đầu build..... "
echo "-------------------------------------------------------------"
chmod 755 build chmod 755 build
./build update_script ./build update_script
./build update ./build update

View File

@@ -334,15 +334,15 @@ clean_dev()
echo ""; echo "";
echo "DirectAdmin will now be installed on: $OS $OS_VER"; echo "DirectAdmin will now be installed on: $OS $OS_VER";
if [ $CMD_LINE -eq 0 ]; then # if [ $CMD_LINE -eq 0 ]; then
echo -n "Is this correct? (must match license) (y,n) : "; # echo -n "Is this correct? (must match license) (y,n) : ";
read yesno; # read yesno;
if [ "$yesno" = "n" ]; then # if [ "$yesno" = "n" ]; then
echo -e "\nPlease change the value in your license, or install the correct operating system\n"; # echo -e "\nPlease change the value in your license, or install the correct operating system\n";
exit 1; # exit 1;
fi # fi
fi # fi
# Hexan # Hexan
PWD_DIR=`pwd` PWD_DIR=`pwd`
@@ -777,8 +777,9 @@ chmod 600 $SETUP
# Install it # Install it
cd $SCRIPTS_PATH; cd $SCRIPTS_PATH;
echo "-----------------"
echo "Chạy ./install.sh $CMD_LINE" echo "Chạy ./install.sh $CMD_LINE"
echo "-----------------"
./install.sh $CMD_LINE ./install.sh $CMD_LINE
RET=$? RET=$?