merge stable

This commit is contained in:
Usman Nasir
2020-04-22 21:16:20 +05:00
5 changed files with 5 additions and 3 deletions

View File

@@ -618,7 +618,7 @@ check_root() {
echo -e "\nChecking root privileges...\n" echo -e "\nChecking root privileges...\n"
if echo $SUDO_TEST | grep SUDO > /dev/null ; then if echo $SUDO_TEST | grep SUDO > /dev/null ; then
echo -e "\nYou are using SUDO , please run as root user...\n" echo -e "\nYou are using SUDO , please run as root user...\n"
echo -e "If you don't have direct access to root user, please run \e[31msudo su -\e[39m command and then run installation command again." echo -e "\nIf you don't have direct access to root user, please run \e[31msudo su -\e[39m command (do NOT miss the \e[31m-\e[39m at end or it will fail) and then run installation command again."
exit exit
fi fi

View File

@@ -136,7 +136,7 @@ check_root() {
echo -e "\nChecking root privileges...\n" echo -e "\nChecking root privileges...\n"
if echo $SUDO_TEST | grep SUDO > /dev/null ; then if echo $SUDO_TEST | grep SUDO > /dev/null ; then
echo -e "\nYou are using SUDO , please run as root user...\n" echo -e "\nYou are using SUDO , please run as root user...\n"
echo -e "If you don't have direct access to root user, please run \e[31msudo su -\e[39m command and then run upgrade command again." echo -e "\nIf you don't have direct access to root user, please run \e[31msudo su -\e[39m command (do NOT miss the \e[31m-\e[39m at end or it will fail) and then run upgrade command again."
exit exit
fi fi

View File

@@ -360,7 +360,7 @@ sudo_check() {
echo -e "\nChecking root privileges..." echo -e "\nChecking root privileges..."
if echo $SUDO_TEST | grep SUDO > /dev/null ; then if echo $SUDO_TEST | grep SUDO > /dev/null ; then
echo -e "\nYou are using SUDO , please run as root user..." echo -e "\nYou are using SUDO , please run as root user..."
echo -e "If you don't have direct access to root user, please run \e[31msudo su -\e[39m command and then run installation command again." echo -e "\nIf you don't have direct access to root user, please run \e[31msudo su -\e[39m command (do NOT miss the \e[31m-\e[39m at end or it will fail) and then run utility command again."
exit exit
fi fi

1
faq.sh
View File

@@ -11,6 +11,7 @@ NC='\033[0m' # No Color
#${GREEN} ${BLUE} #${GREEN} ${BLUE}
echo -e "Use Up/Down Arrow key to navigate\n" echo -e "Use Up/Down Arrow key to navigate\n"
echo -e "press ${RED}q${NC} to exit\n"
echo -e "Frequently Asked Question echo -e "Frequently Asked Question
${PURPLE}1.${NC} How to reset CyberPanel admin password? ${PURPLE}1.${NC} How to reset CyberPanel admin password?

View File

@@ -451,6 +451,7 @@ class InstallCyberPanel:
command = 'echo "/etc/pure-ftpd/db/mysql.conf" > /etc/pure-ftpd/conf/MySQLConfigFile' command = 'echo "/etc/pure-ftpd/db/mysql.conf" > /etc/pure-ftpd/conf/MySQLConfigFile'
subprocess.call(command, shell=True) subprocess.call(command, shell=True)
command = 'ln -s /etc/pure-ftpd/conf/MySQLConfigFile /etc/pure-ftpd/auth/30mysql' command = 'ln -s /etc/pure-ftpd/conf/MySQLConfigFile /etc/pure-ftpd/auth/30mysql'
install.preFlightsChecks.call(command, self.distro, command, command, 1, 1, os.EX_OSERR) install.preFlightsChecks.call(command, self.distro, command, command, 1, 1, os.EX_OSERR)