Skip to content

Fix typos in shell scripts and error messages #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Avicennasis wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix typos in shell scripts and error messages #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion func/ip.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
4 changes: 2 additions & 2 deletions install/linkpnl-install-debian.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions install/linkpnl-install-ubuntu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion install/upgrade/manual/install_awstats_geoip.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion install/upgrade/manual/install_awstats_geoip2.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions install/upgrade/manual/install_sieve.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 #
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion install/upgrade/manual/migrate_multiphp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions install/upgrade/manual/migrate_phpmyadmin.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 #
Expand All @@ -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]'

#----------------------------------------------------------#
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions install/upgrade/manual/migrate_roundcube.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 #
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion install/upgrade/versions/1.4.0.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion install/upgrade/versions/1.5.5.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ if [ ! -f "/usr/share/keyrings/nginx-keyring.gpg" ]; then
ARCH="arm64"
;;
*)
echo " [ ! ] Unsuported architectrue"
echo " [ ! ] Unsupported architecture"
;;
esac

Expand Down
6 changes: 3 additions & 3 deletions install/upgrade/versions/1.7.0.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down