Raphael Schneeberger пре 7 година
родитељ
комит
4f8733a289
1 измењених фајлова са 18 додато и 18 уклоњено
  1. 18 18
      install/hst-migration.sh

+ 18 - 18
install/hst-migration.sh

@@ -3,7 +3,7 @@
 # https://www.hestiacp.com
 
 #
-# Currently Supported Operating Systems:
+# Currently supported Operating Systems:
 #
 #   Debian 8, 9
 #   Ubuntu 14.04, 16.04, 18.04
@@ -27,7 +27,7 @@ if [ "$type" = "NoSupport" ]; then
     exit 1;
 fi
 
-# Detect Codename
+# Detect codename
 if [ "$type" = "debian" ]; then
     codename="$(cat /etc/os-release |grep VERSION= |cut -f 2 -d \(|cut -f 1 -d \))"
     release=$(cat /etc/debian_version|grep -o [0-9]|head -n1)
@@ -56,21 +56,21 @@ else
     exit 1
 fi
 
-# Check the Vesta Version
+# Check current Vesta version
 if [ ! "$VERSION" = "0.9.8" ]; then
-    echo "Wrong Vesta Version, stopping here."
+    echo "Wrong Vesta version, stopping here."
     exit 1
 fi
 
-# Inform abouot and ask to proceed migration.
+# Inform user and request confirmation for migration
 loop=1
 while [ "$loop" -eq 1 ]; do
     echo "Would you like to migrate to HestiaCP?"
-    read -p "Please be warned, that we've removed and do not support softaculous and payed VestaCP extensions! [yes/no]: " sure
+    read -p "Please be warned, that we have removed and do not support Softaculous and paid VestaCP extensions! [yes/no]: " sure
     if [ $sure == 'yes' ] || [ $sure == 'no' ]; then
         loop=0
         if [ $sure == 'no' ]; then
-            echo "Canceling migration..."
+            echo "Cancelling migration..."
             exit 1
         fi
     else
@@ -88,14 +88,14 @@ if [ ! -e '/usr/lib/apt/methods/https' ]; then
     check_result $? "Can't install apt-transport-https"
 fi
 
-# Remove Vesta Repository if it exists.
+# Remove Vesta Repository if it exists
 echo "Removeing VestaCP Repository..."
 if [ -f /usr/local/vesta/conf/vesta.conf ]; then
     rm /etc/apt/sources.list.d/vesta.list*
 fi
 
 if [ "$type" = "debian" ]; then
-    # Installing sury php repo
+    # Installing sury PHP repo
     echo "deb https://packages.sury.org/php/ $codename main" > $apt/php.list
     wget https://packages.sury.org/php/apt.gpg -O /tmp/php_signing.key
     apt-key add /tmp/php_signing.key
@@ -110,17 +110,17 @@ if [ "$type" = "ubuntu" ]; then
     add-apt-repository -y ppa:ondrej/php > /dev/null 2>&1
 fi
 
-# Installing hestia repo
+# Installing HestiaCP repo
 echo "deb https://$RHOST/ $codename main" > $apt/hestia.list
 wget https://gpg.hestiacp.com/deb_signing.key -O deb_signing.key
 apt-key add deb_signing.key
 
-# Remove vesta packages
-echo "Remove VestaCP packages..."
+# Remove Vesta packages
+echo "Removing VestaCP packages..."
 systemctl stop vesta
 apt-get -qq remove vesta vesta-nginx vesta-php vesta-ioncube vesta-softaculous -y > /dev/null 2>&1
 
-# Clear up softaculous
+# Remove Softaculous
 rm -fr /usr/local/vesta/softaculous
 sed -i '/SOFTACULOUS/d' /usr/local/vesta/conf/vesta.conf
 
@@ -129,13 +129,13 @@ mv /etc/profile.d/vesta.sh /etc/profile.d/hestia.sh
 mv /usr/local/vesta $HESTIA
 mv $HESTIA/conf/vesta.conf $HESTIA/conf/hestia.conf
 
-# Install hestia packages
+# Install Hestia packages
 echo "Update System Repository and install HestiaCP Packages..."
 apt-get -qq update
 apt-get -qq upgrade -y  > /dev/null 2>&1
 apt-get -qq install hestia hestia-nginx hestia-php -y  > /dev/null 2>&1
 
-# Add changed configuration files
+# Add modified configuration files
 echo "export HESTIA='$HESTIA'" >> /etc/profile.d/hestia.sh
 
 rm /etc/sudoers.d/admin
@@ -157,7 +157,7 @@ sed -i 's/vesta/hestia/g' /etc/roundcube/config.inc.php
 rm /etc/logrotate.d/vesta
 cp -f $hestiacp/logrotate/vesta /etc/logrotate.d/hestia
 
-# Restart hestia service once
+# Restart Hestia service
 systemctl restart hestia
 
 # Create compatiblity symlinks
@@ -167,5 +167,5 @@ ln -s $HESTIA/conf/hestia.conf /usr/local/vesta/conf/vesta.conf
 # Update firewall rules
 $HESTIA/bin/v-update-firewall
 
-echo "Migration is finished, you're running now HestiaCP instead VestaCP."
-echo "Please contact us if you've any troubles using our forum: https://forum.hestiacp.com"
+echo "Migration has finished successfully! You are now running HestiaCP instead of VestaCP."
+echo "Please contact us in case you face any issues, by using our forum: https://forum.hestiacp.com"