Parcourir la source

Merge pull request #1848 from mach0/main

fix some typos in communication messages
Jaap Marcus il y a 4 ans
Parent
commit
b3b0ac509d

+ 3 - 3
bin/v-add-sys-roundcube

@@ -51,12 +51,12 @@ if [ -z "$HOMEDIR" ] || [ -z "$HESTIA_INSTALL_DIR" ]; then
 fi
 fi
 
 
 if [ -z "$(echo "$DB_SYSTEM" | grep -w 'mysql')" ]; then
 if [ -z "$(echo "$DB_SYSTEM" | grep -w 'mysql')" ]; then
-    echo "ERROR: Mysql not available. Instalation aborted"
+    echo "ERROR: Mysql not available. Installation aborted"
     exit 2
     exit 2
 fi
 fi
 
 
 if [ -d "/usr/share/roundcube" ]; then
 if [ -d "/usr/share/roundcube" ]; then
-    echo "ERROR: Install done from atp source unable to continue"
+    echo "ERROR: Install done from apt source, unable to continue"
     exit 2;
     exit 2;
 fi
 fi
 
 
@@ -64,7 +64,7 @@ fi
 if [ -f "/var/lib/roundcube/index.php" ]; then
 if [ -f "/var/lib/roundcube/index.php" ]; then
     version=$(cat $RC_INSTALL_DIR/index.php | grep -o -E '[0-9].[0-9].[0-9]+' | head -1);
     version=$(cat $RC_INSTALL_DIR/index.php | grep -o -E '[0-9].[0-9].[0-9]+' | head -1);
     if [ "$version" == "$rc_v" ]; then
     if [ "$version" == "$rc_v" ]; then
-        echo "Error: Installed version ($version) is equal as the availble version ($rc_v)"
+        echo "Error: Installed version ($version) is equal to the available version ($rc_v)"
         exit 2;
         exit 2;
     else 
     else 
         UPDATE="yes"
         UPDATE="yes"

+ 1 - 1
install/upgrade/manual/migrate_roundcube.sh

@@ -23,7 +23,7 @@ if [ ! -d "/usr/share/roundcube/" ]; then
 fi
 fi
 
 
 
 
-echo "For deleting Roudcube you will need confirm the removal with root password. Password can be found in /usr/local/hestia/conf/mysql.conf"
+echo "For deleting Roundcube you will need confirm the removal with root password. Password can be found in /usr/local/hestia/conf/mysql.conf"
 read -p "Please enter Y to continue" -n 1 -r
 read -p "Please enter Y to continue" -n 1 -r
 echo    # (optional) move to a new line
 echo    # (optional) move to a new line
 if [[ $REPLY =~ ^[Yy]$ ]]
 if [[ $REPLY =~ ^[Yy]$ ]]

+ 2 - 2
install/upgrade/manual/upgrade_multi_php.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 #!/bin/bash
-# Update www.conf to the a different version so users can safely deleted older php version. 
+# Update www.conf to a different version so users can safely delete older php version. 
 # www.conf is used for Roundcube, Rainloop and phpmyadmin
 # www.conf is used for Roundcube, Rainloop and phpmyadmin
-# Removal of the "www.conf" php version will cause issues with Rainloop not working. Current script updates it to the latests version of PHP installed. If that is not wanted use this script
+# Removal of the "www.conf" php version will cause issues with Rainloop not working. Current script updates it to the latest version of PHP installed. If that is not wanted use this script
 
 
 version=$1
 version=$1
 if [ ! -x "$(command -v php)" ]; then
 if [ ! -x "$(command -v php)" ]; then