Преглед изворни кода

Minor code comment/style fixes in hst-install-ubuntu.sh

Alexandros Ioannides пре 6 година
родитељ
комит
30832e5eba
1 измењених фајлова са 5 додато и 6 уклоњено
  1. 5 6
      install/hst-install-ubuntu.sh

+ 5 - 6
install/hst-install-ubuntu.sh

@@ -357,7 +357,7 @@ if [ -d /etc/netplan ] && [ -z "$force" ]; then
         echo
         echo
         echo '!!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!'
         echo '!!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!'
         echo
         echo
-        check_result 1 "Unable to detect netplan configuration."    
+        check_result 1 "Unable to detect netplan configuration."
     fi
     fi
 fi
 fi
 
 
@@ -554,7 +554,6 @@ APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add /tmp/nginx_signing.key > /dev
 echo "(*) PHP"
 echo "(*) PHP"
 LC_ALL=C.UTF-8 add-apt-repository -y ppa:ondrej/php > /dev/null 2>&1
 LC_ALL=C.UTF-8 add-apt-repository -y ppa:ondrej/php > /dev/null 2>&1
 
 
-
 # Installing MariaDB repo
 # Installing MariaDB repo
 echo "(*) MariaDB"
 echo "(*) MariaDB"
 echo "deb [arch=amd64] http://ams2.mirrors.digitalocean.com/mariadb/repo/10.3/$VERSION $codename main" > $apt/mariadb.list
 echo "deb [arch=amd64] http://ams2.mirrors.digitalocean.com/mariadb/repo/10.3/$VERSION $codename main" > $apt/mariadb.list
@@ -647,7 +646,7 @@ if [ "$multiphp" = 'yes' ]; then
              php$v-gd php$v-intl php$v-mysql php$v-soap php$v-xml php$v-zip
              php$v-gd php$v-intl php$v-mysql php$v-soap php$v-xml php$v-zip
              php$v-mbstring php$v-json php$v-bz2 php$v-pspell"
              php$v-mbstring php$v-json php$v-bz2 php$v-pspell"
         # Check is version is 7.1 or below to add mcrypt
         # Check is version is 7.1 or below to add mcrypt
-        if [[ `echo "$v 7.2" | awk '{print ($1 < $2)}'` == 1 ]]; then 
+        if [[ `echo "$v 7.2" | awk '{print ($1 < $2)}'` == 1 ]]; then
             mph="$mph php$v-mcrypt"
             mph="$mph php$v-mcrypt"
         fi
         fi
         software="$software $mph"
         software="$software $mph"
@@ -1337,7 +1336,7 @@ if [ "$named" = 'yes' ]; then
         if [ $? -ne 0 ]; then
         if [ $? -ne 0 ]; then
             service apparmor restart
             service apparmor restart
         fi
         fi
-    fi    
+    fi
     update-rc.d bind9 defaults
     update-rc.d bind9 defaults
     service bind9 start
     service bind9 start
     check_result $? "bind9 start failed"
     check_result $? "bind9 start failed"
@@ -1511,7 +1510,7 @@ if [ "$fail2ban" = 'yes' ]; then
         fline=$(cat /etc/fail2ban/jail.local |grep -n vsftpd-iptables -A 2)
         fline=$(cat /etc/fail2ban/jail.local |grep -n vsftpd-iptables -A 2)
         fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -)
         fline=$(echo "$fline" |grep enabled |tail -n1 |cut -f 1 -d -)
         sed -i "${fline}s/false/true/" /etc/fail2ban/jail.local
         sed -i "${fline}s/false/true/" /etc/fail2ban/jail.local
-    fi 
+    fi
     update-rc.d fail2ban defaults
     update-rc.d fail2ban defaults
     service fail2ban start
     service fail2ban start
     check_result $? "fail2ban start failed"
     check_result $? "fail2ban start failed"
@@ -1651,7 +1650,7 @@ fi
 # Sending notification to admin email
 # Sending notification to admin email
 echo -e "Congratulations!
 echo -e "Congratulations!
 
 
-You have successfully installed Hestia Control Panel on your server. 
+You have successfully installed Hestia Control Panel on your server.
 
 
 Ready to get started? Log in using the following credentials:
 Ready to get started? Log in using the following credentials: