diff --git a/func/ip.sh b/func/ip.sh index 57a04eb..daf1319 100644 --- a/func/ip.sh +++ b/func/ip.sh @@ -20,7 +20,7 @@ is_ip_owner() { # Check if ip address is free is_ip_free() { if [ -e "$LINKPANEL/data/ips/$ip" ]; then - check_result "$E_EXISTS" "$ip is already exists" + check_result "$E_EXISTS" "$ip already exists" fi } diff --git a/install/linkpnl-install-debian.sh b/install/linkpnl-install-debian.sh index 07124ad..175ea1b 100644 --- a/install/linkpnl-install-debian.sh +++ b/install/linkpnl-install-debian.sh @@ -185,7 +185,7 @@ sort_config_file() { validate_username() { if [[ "$username" =~ ^[[:alnum:]][-|\.|_[:alnum:]]{0,28}[[:alnum:]]$ ]]; then if [ -n "$(grep ^$username: /etc/passwd /etc/group)" ]; then - echo -e "\nUsername or Group allready exists please select a new user name or delete the user and / or group." + echo -e "\nUsername or Group already exists please select a new user name or delete the user and / or group." else return 1 fi @@ -1194,7 +1194,7 @@ systemctl restart ssh # Disable AWStats cron rm -f /etc/cron.d/awstats -# Replace awstatst function +# Replace awstats function cp -f $LINKPANEL_INSTALL_DIR/logrotate/httpd-prerotate/* /etc/logrotate.d/httpd-prerotate/ # Set directory color diff --git a/install/linkpnl-install-ubuntu.sh b/install/linkpnl-install-ubuntu.sh index 3cc5a37..467b698 100644 --- a/install/linkpnl-install-ubuntu.sh +++ b/install/linkpnl-install-ubuntu.sh @@ -186,7 +186,7 @@ sort_config_file() { validate_username() { if [[ "$username" =~ ^[[:alnum:]][-|\.|_[:alnum:]]{0,28}[[:alnum:]]$ ]]; then if [ -n "$(grep ^$username: /etc/passwd /etc/group)" ]; then - echo -e "\nUsername or Group allready exists please select a new user name or delete the user and / or group." + echo -e "\nUsername or Group already exists please select a new user name or delete the user and / or group." else return 1 fi @@ -1177,7 +1177,7 @@ systemctl restart ssh # Disable AWStats cron rm -f /etc/cron.d/awstats -# Replace awstatst function +# Replace awstats function cp -f $LINKPANEL_INSTALL_DIR/logrotate/httpd-prerotate/* /etc/logrotate.d/httpd-prerotate/ # Set directory color diff --git a/install/upgrade/manual/install_awstats_geoip.sh b/install/upgrade/manual/install_awstats_geoip.sh index cc34d7e..b4aae12 100644 --- a/install/upgrade/manual/install_awstats_geoip.sh +++ b/install/upgrade/manual/install_awstats_geoip.sh @@ -20,7 +20,7 @@ source $LINKPANEL/conf/linkpanel.conf #check if string already exists if grep "geoip" $LINKPANEL/data/templates/web/awstats/awstats.tpl; then - echo "Plugin allready enabled" + echo "Plugin already enabled" exit 0 fi diff --git a/install/upgrade/manual/install_awstats_geoip2.sh b/install/upgrade/manual/install_awstats_geoip2.sh index b28a3ac..f181f22 100644 --- a/install/upgrade/manual/install_awstats_geoip2.sh +++ b/install/upgrade/manual/install_awstats_geoip2.sh @@ -20,7 +20,7 @@ source $LINKPANEL/conf/linkpanel.conf #check if string already exists if grep "geoip2" $LINKPANEL/data/templates/web/awstats/awstats.tpl; then - echo "Plugin allready enabled" + echo "Plugin already enabled" exit 0 fi diff --git a/install/upgrade/manual/install_sieve.sh b/install/upgrade/manual/install_sieve.sh index 65096cc..6a3ed7d 100644 --- a/install/upgrade/manual/install_sieve.sh +++ b/install/upgrade/manual/install_sieve.sh @@ -1,7 +1,7 @@ #!/bin/bash # info: Install / remove sieve / manage-sieve for Dovecot # -# Thos function installs manage-sieve functionality for dovecot. +# This function installs manage-sieve functionality for dovecot. #----------------------------------------------------------# # Variable&Function # @@ -22,7 +22,7 @@ source_conf "$LINKPANEL/install/upgrade/upgrade.conf" #check if string already exists if grep "dovecot_virtual_delivery" /etc/exim4/exim4.conf.template; then - echo "Plugin allready enabled" + echo "Plugin already enabled" exit 0 fi diff --git a/install/upgrade/manual/migrate_multiphp.sh b/install/upgrade/manual/migrate_multiphp.sh index 02afc02..c2a76ea 100644 --- a/install/upgrade/manual/migrate_multiphp.sh +++ b/install/upgrade/manual/migrate_multiphp.sh @@ -98,7 +98,7 @@ if [ "$num_php_versions" -gt 1 ] && [ -z "$WEB_BACKEND" ]; then web_tpl="$domain_tpl" if [ -f "${WEBTPL}/$WEB_SYSTEM/php-fpm/$web_tpl.tpl" ]; then - # php-fpm backend folder allready has a template with the same name + # php-fpm backend folder already has a template with the same name web_tpl="custom-$domain_tpl" fi diff --git a/install/upgrade/manual/migrate_phpmyadmin.sh b/install/upgrade/manual/migrate_phpmyadmin.sh index 30de373..4a293d3 100644 --- a/install/upgrade/manual/migrate_phpmyadmin.sh +++ b/install/upgrade/manual/migrate_phpmyadmin.sh @@ -1,5 +1,5 @@ #!/bin/bash -# info: Disconnect phpMyadmin from APT and solving issues with PHPMyadmin accidental updates from ATP +# info: Disconnect phpMyadmin from APT and solving issues with PHPMyadmin accidental updates from APT #----------------------------------------------------------# # Variable&Function # @@ -15,7 +15,7 @@ source $LINKPANEL/conf/linkpanel.conf # Verifications # #----------------------------------------------------------# -echo "To remove phpMyAdmin you will need use the root password. Password can be found in /usr/local/linkpanel/conf/mysql.conf" +echo "To remove phpMyAdmin you will need to use the root password. Password can be found in /usr/local/linkpanel/conf/mysql.conf" read -p 'Would you like to continue? [y/n]' #----------------------------------------------------------# @@ -31,7 +31,7 @@ if [[ $REPLY =~ ^[Yy]$ ]]; then $BIN/v-delete-sys-pma-sso fi - # Create an backup of current config + # Create a backup of current config echo "[ * ] Backing up old configuration files..." mkdir -p /root/linkpnl_backup_man/phmyadmin cp -r /etc/phpmyadmin/* /root/linkpnl_backup_man/phmyadmin diff --git a/install/upgrade/manual/migrate_roundcube.sh b/install/upgrade/manual/migrate_roundcube.sh index 6e59e4a..0b5d42c 100644 --- a/install/upgrade/manual/migrate_roundcube.sh +++ b/install/upgrade/manual/migrate_roundcube.sh @@ -1,5 +1,5 @@ #!/bin/bash -# info: Disconnect Roundcube from APT and solving issues with Roundcube accidental updates from ATP +# info: Disconnect Roundcube from APT and solving issues with Roundcube accidental updates from APT #----------------------------------------------------------# # Variable&Function # @@ -24,7 +24,7 @@ fi # Action # #----------------------------------------------------------# -echo "To remove Roundcube you will need use the root password. Password can be found in /usr/local/linkpanel/conf/mysql.conf" +echo "To remove Roundcube you will need to use the root password. Password can be found in /usr/local/linkpanel/conf/mysql.conf" read -p 'Would you like to continue? [y/n]' -n 1 -r echo # (optional) move to a new line if [[ $REPLY =~ ^[Yy]$ ]]; then @@ -34,7 +34,7 @@ if [[ $REPLY =~ ^[Yy]$ ]]; then echo "SET FOREIGN_KEY_CHECKS = 0;" >> ~/roundcube.sql mysqldump --add-drop-table roundcube >> ~/roundcube.sql echo "SET FOREIGN_KEY_CHECKS = 1;" >> ~/roundcube.sql - echo '[ * ] Remove Roundcube via ATP' + echo '[ * ] Remove Roundcube via APT' apt-get autoremove roundcube-core roundcube-mysql roundcube-plugins echo '[ * ] Delete possible trail' # make sure everything is deleted diff --git a/install/upgrade/versions/1.4.0.sh b/install/upgrade/versions/1.4.0.sh index 65f7c3b..6ab8fd7 100644 --- a/install/upgrade/versions/1.4.0.sh +++ b/install/upgrade/versions/1.4.0.sh @@ -184,7 +184,7 @@ fi # Update ClamAV configuration file if [ -f "/etc/clamav/clamd.conf" ]; then cp -f $LINKPANEL_INSTALL_DIR/clamav/clamd.conf /etc/clamav/ - $LINKPANEL/bin/v-add-user-notification admin 'ClamAV config has been overwritten' 'Warning: If you have manualy changed /etc/clamav/clamd.conf and any changes you made will be lost an backup has been created in the /root/linkpnl_backups folder with the original config. If you have not changed the config file you can ignore this message' + $LINKPANEL/bin/v-add-user-notification admin 'ClamAV config has been overwritten' 'Warning: If you have manualy changed /etc/clamav/clamd.conf and any changes you made will be lost a backup has been created in the /root/linkpnl_backups folder with the original config. If you have not changed the config file you can ignore this message' fi ##### COMMANDS FOR V1.5.X diff --git a/install/upgrade/versions/1.5.5.sh b/install/upgrade/versions/1.5.5.sh index aaf2ea0..b5955d5 100644 --- a/install/upgrade/versions/1.5.5.sh +++ b/install/upgrade/versions/1.5.5.sh @@ -42,7 +42,7 @@ if [ ! -f "/usr/share/keyrings/nginx-keyring.gpg" ]; then ARCH="arm64" ;; *) - echo " [ ! ] Unsuported architectrue" + echo " [ ! ] Unsupported architecture" ;; esac diff --git a/install/upgrade/versions/1.7.0.sh b/install/upgrade/versions/1.7.0.sh index a779a72..ca90e95 100644 --- a/install/upgrade/versions/1.7.0.sh +++ b/install/upgrade/versions/1.7.0.sh @@ -96,13 +96,13 @@ if [ "$FTP_SYSTEM" = 'proftpd' ]; then fi if echo "$BACKUP_SYSTEM" | grep "google" > /dev/null; then - echo "[ ! ] Deprecation notice: Backup via Google Cloud has been removed setup backup again via Rclone to reinstate the backup and restore capebilities!" - add_upgrade_message "Deprecation notice: Backup via Google Cloud has been removed setup backup again via Rclone to reinstate the backup and restore capebilities!" + echo "[ ! ] Deprecation notice: Backup via Google Cloud has been removed setup backup again via Rclone to reinstate the backup and restore capabilities!" + add_upgrade_message "Deprecation notice: Backup via Google Cloud has been removed setup backup again via Rclone to reinstate the backup and restore capabilities!" fi if [ -f /etc/logrotate.d/httpd-prerotate/awstats ]; then echo "[ * ] Update Awstats prerotate to LinkPanel update method..." - # Replace awstatst function + # Replace awstats function cp -f $LINKPANEL_INSTALL_DIR/logrotate/httpd-prerotate/awstats /etc/logrotate.d/httpd-prerotate/ fi