From 2e3ec7883f0bd40ab0e682dabfabb06df157b31e Mon Sep 17 00:00:00 2001 From: bach Date: Fri, 4 Sep 2026 09:35:02 +0200 Subject: [PATCH] Replace echo -e with printf for portable ANSI banners dash (Debian's /bin/sh) doesn't support echo's -e flag: it prints "-e" literally as text before processing the rest of the string's backslash escapes. Every script's colored banner was affected. printf's escape handling is POSIX-mandated and behaves identically under dash and bash, so swap all 90 echo -e calls for printf, appending the trailing \n that echo used to add implicitly. Co-Authored-By: Claude Sonnet 5 --- bin/_addUserSite.sh | 20 ++++++------ bin/autoupdate.sh | 8 ++--- bin/dotfiles.sh | 8 ++--- bin/email.sh | 10 +++--- bin/fail2ban.sh | 8 ++--- bin/firewall.sh | 8 ++--- bin/ftp.sh | 4 +-- bin/gitbarrerepos.sh | 6 ++-- bin/knockd.sh | 10 +++--- bin/lemp.sh | 70 ++++++++++++++++++++--------------------- bin/misc.sh | 6 ++-- bin/mysql-db.sh | 6 ++-- bin/mysqlbackup.sh | 4 +-- bin/nfs.sh | 6 ++-- bin/php7.4.sh | 4 +-- bin/postgresqlbackup.sh | 4 +-- bin/ssh.sh | 6 ++-- bin/upgrade.sh | 4 +-- bin/urbackup.sh | 4 +-- bin/user.sh | 8 ++--- bin/vhost.sh | 10 +++--- bin/webhook.sh | 4 +-- bin/zabbix.sh | 10 +++--- install.sh | 20 ++++++------ 24 files changed, 124 insertions(+), 124 deletions(-) diff --git a/bin/_addUserSite.sh b/bin/_addUserSite.sh index bcb8cc3..672fd0a 100755 --- a/bin/_addUserSite.sh +++ b/bin/_addUserSite.sh @@ -4,14 +4,14 @@ # TODO check if root -echo -e '\033[35m +printf '\033[35m __ _______ __________ / / / / ___// ____/ __ \ / / / /\__ \/ __/ / /_/ / / /_/ /___/ / /___/ _, _/ \____//____/_____/_/ |_| -\033[0m' -echo -e "\033[35;1mCreate new user (you will be asked a user name and a password) \033[0m" +\033[0m\n' +printf "\033[35;1mCreate new user (you will be asked a user name and a password) \033[0m\n" sleep 3 while [ "$user" = "" ] do @@ -34,14 +34,14 @@ mkdir /home/$user/backups chmod -w /home/"$user" -echo -e '\033[35m +printf '\033[35m __ __ _ __/ /_ ____ _____/ /_ | | / / __ \/ __ \/ ___/ __/ | |/ / / / / /_/ (__ ) /_ |___/_/ /_/\____/____/\__/ -\033[0m' -echo -e "\033[35;1mVHOST install \033[0m" +\033[0m\n' +printf "\033[35;1mVHOST install \033[0m\n" while [ "$_host_name" = "" ] do @@ -75,20 +75,20 @@ ln -s /home/"$user"/logs /var/www/"$_host_name"/logs # a2ensite "$_host_name".conf #restart apache # service apache2 restart -echo -e "\033[92;1mvhost $_host_name configured\033[Om" +printf "\033[92;1mvhost $_host_name configured\033[Om\n" # todo add mysql user and database -echo -e '\033[35m +printf '\033[35m __ ___ __ / |/ /_ ___________ _/ / / /|_/ / / / / ___/ __ `/ / / / / / /_/ (__ ) /_/ / / /_/ /_/\__, /____/\__, /_/ /____/ /_/ -\033[0m' -echo -e "\033[35;1mMysql database \033[0m" +\033[0m\n' +printf "\033[35;1mMysql database \033[0m\n" while [ "$_dbname" = "" ] do diff --git a/bin/autoupdate.sh b/bin/autoupdate.sh index a0e9b1c..7909f30 100755 --- a/bin/autoupdate.sh +++ b/bin/autoupdate.sh @@ -1,13 +1,13 @@ #!/bin/sh -echo -e '\033[35m +printf '\033[35m ___ __ __ __ __ __ / | __ __/ /_____ / / / /___ ____/ /___ _/ /____ / /| |/ / / / __/ __ \ / / / / __ \/ __ / __ `/ __/ _ \ / ___ / /_/ / /_/ /_/ / / /_/ / /_/ / /_/ / /_/ / /_/ __/ /_/ |_\__,_/\__/\____/ \____/ .___/\__,_/\__,_/\__/\___/ /_/ -\033[0m' +\033[0m\n' # https://www.howtoforge.com/how-to-configure-automatic-updates-on-debian-wheezy # https://www.bisolweb.com/tutoriels/serveur-vps-ovh-partie-5-installation-apticron/ @@ -16,7 +16,7 @@ if [ "$(id -u)" -ne 0 ]; then exit fi -echo -e "\033[35;1mInstalling apticron \033[0m" +printf "\033[35;1mInstalling apticron \033[0m\n" apt-get --yes install apticron sleep 3 @@ -27,4 +27,4 @@ sed -i -r "s/EMAIL=\"root\"/EMAIL=\"$email\"/g" /etc/apticron/apticron.conf # sed -i -r "s/# DIFF_ONLY=\"1\"/DIFF_ONLY=\"1\"/g" /etc/apticron/apticron.conf sed -i -r "s/# NOTIFY_NEW=\"0\"/NOTIFY_NEW=\"0\"/g" /etc/apticron/apticron.conf -echo -e "\033[92;1mApticron installed and configured\033[0m" +printf "\033[92;1mApticron installed and configured\033[0m\n" diff --git a/bin/dotfiles.sh b/bin/dotfiles.sh index 38a05b6..5679f63 100755 --- a/bin/dotfiles.sh +++ b/bin/dotfiles.sh @@ -1,14 +1,14 @@ #!/bin/sh -echo -e '\033[35m +printf '\033[35m ____ __ _______ __ / __ \____ / /_ / ____(_) /__ _____ / / / / __ \/ __/ / /_ / / / _ \/ ___/ / /_/ / /_/ / /_ / __/ / / / __(__ ) /_____/\____/\__/ /_/ /_/_/\___/____/ -\033[0m' +\033[0m\n' #installing better prompt and some goodies -echo -e "\033[35;1mInstalling shell prompt for current user $USER \033[0m" +printf "\033[35;1mInstalling shell prompt for current user $USER \033[0m\n" sleep 2 # get the current position _cwd="$(pwd)" @@ -19,4 +19,4 @@ git clone https://figureslibres.io/gitea/bachir/dotfiles-server.git ~/.dotfiles- source ~/.bashrc # return to working directory cd "$_cwd" -echo -e "\033[92;1mDot files installed for $USER\033[0m" +printf "\033[92;1mDot files installed for $USER\033[0m\n" diff --git a/bin/email.sh b/bin/email.sh index 8f4103c..66cf8ff 100755 --- a/bin/email.sh +++ b/bin/email.sh @@ -1,13 +1,13 @@ #!/bin/sh -echo -e '\033[35m +printf '\033[35m __ ______ ______ / |/ / | / _/ / / /|_/ / /| | / // / / / / / ___ |_/ // /___ /_/ /_/_/ |_/___/_____/ -\033[0m' -echo -e "\033[35;1mEnable mail sending for php \033[0m" +\033[0m\n' +printf "\033[35;1mEnable mail sending for php \033[0m\n" if [ "$(id -u)" -ne 0 ]; then echo "Please run as root" @@ -29,7 +29,7 @@ fi # http://www.sycha.com/lamp-setup-debian-linux-apache-mysql-php#anchor13 sleep 2 apt-get --yes install exim4 -echo -e "\033[35;1mConfiguring EXIM4 \033[0m" +printf "\033[35;1mConfiguring EXIM4 \033[0m\n" while [ "$configexim" != "y" ] && [ "$configexim" != "n" ] do echo -n "Should we configure exim4 ? [y|n] " @@ -48,7 +48,7 @@ systemctl restart exim4 # dkim spf # https://debian-administration.org/article/718/DKIM-signing_outgoing_mail_with_exim4 -echo -e "\033[35;1mConfiguring DKIM \033[0m" +printf "\033[35;1mConfiguring DKIM \033[0m\n" while [ "$installdkim" != "y" ] && [ "$installdkim" != "n" ] do echo -n "Should we install dkim for exim4 ? [y|n] " diff --git a/bin/fail2ban.sh b/bin/fail2ban.sh index 62d8da9..b59c043 100755 --- a/bin/fail2ban.sh +++ b/bin/fail2ban.sh @@ -2,14 +2,14 @@ # TODO check if root -echo -e '\033[35m +printf '\033[35m ______ _ _____ __ / ____/___ _(_) /__ \ / /_ ____ _____ / /_ / __ `/ / /__/ // __ \/ __ `/ __ \ / __/ / /_/ / / // __// /_/ / /_/ / / / / /_/ \__,_/_/_//____/_.___/\__,_/_/ /_/ -\033[0m' -echo -e "\033[35;1mInstalling fall2ban \033[0m" +\033[0m\n' +printf "\033[35;1mInstalling fall2ban \033[0m\n" if [ "$(id -u)" -ne 0 ]; then echo "Please run as root" @@ -23,4 +23,4 @@ cp /etc/fail2ban/jail.conf /etc/fail2ban/jail.local touch /var/log/auth.log systemctl enable fail2ban systemctl restart fail2ban -echo -e "\033[92;1mfail2ban installed and configured\033[Om" +printf "\033[92;1mfail2ban installed and configured\033[Om\n" diff --git a/bin/firewall.sh b/bin/firewall.sh index 2d5e9ec..f68c40a 100755 --- a/bin/firewall.sh +++ b/bin/firewall.sh @@ -2,14 +2,14 @@ # TODO check if root -echo -e '\033[35m +printf '\033[35m ______________ _______ _____ __ __ / ____/ _/ __ \/ ____/ | / / | / / / / / /_ / // /_/ / __/ | | /| / / /| | / / / / / __/ _/ // _, _/ /___ | |/ |/ / ___ |/ /___/ /___ /_/ /___/_/ |_/_____/ |__/|__/_/ |_/_____/_____/ -\033[0m' -echo -e "\033[35;1mInstalling ufw and setup firewall (allowing only ssh and http) \033[0m" +\033[0m\n' +printf "\033[35;1mInstalling ufw and setup firewall (allowing only ssh and http) \033[0m\n" if [ "$(id -u)" -ne 0 ]; then echo "Please run as root" @@ -26,4 +26,4 @@ ufw allow https ufw enable ufw status verbose -echo -e "\033[92;1mufw installed and firwall configured\033[Om" +printf "\033[92;1mufw installed and firwall configured\033[Om\n" diff --git a/bin/ftp.sh b/bin/ftp.sh index df0397f..3b57d6e 100755 --- a/bin/ftp.sh +++ b/bin/ftp.sh @@ -1,14 +1,14 @@ #!/bin/sh -echo -e '\033[35m +printf '\033[35m ______ _______ _____ | ____|__ __| __ \ | |__ | | | |__) | | __| | | | ___/ | | | | | | |_| |_| |_| -\033[0m' +\033[0m\n' if [ "$(id -u)" -ne 0 ] then echo "Please run as root" diff --git a/bin/gitbarrerepos.sh b/bin/gitbarrerepos.sh index f5ffb01..14c4c37 100755 --- a/bin/gitbarrerepos.sh +++ b/bin/gitbarrerepos.sh @@ -4,14 +4,14 @@ # get the current position _cwd="$(pwd)" -echo -e '\033[35m +printf '\033[35m _______ __ / ____(_) /_ / / __/ / __/ / /_/ / / /_ \____/_/\__/ -\033[0m' -echo -e "\033[35;1mCreate new git barre repos and deploy script\033[0m" +\033[0m\n' +printf "\033[35;1mCreate new git barre repos and deploy script\033[0m\n" echo "Git barre repo will be installed in chosen user home directory" echo "git prod repos will be installed in public_html directory of provided domain, the domain have to exists as shortcut in chosen user/www before running this script. Please run first vhost.sh script and say yes to the question create a shortcut !" diff --git a/bin/knockd.sh b/bin/knockd.sh index f8d107a..d2b4e9f 100755 --- a/bin/knockd.sh +++ b/bin/knockd.sh @@ -2,14 +2,14 @@ # TODO check if root -echo -e '\033[35m +printf '\033[35m __ __ __ / /______ ____ _____/ /______/ / / //_/ __ \/ __ \/ ___/ //_/ __ / / ,< / / / / /_/ / /__/ ,< / /_/ / /_/|_/_/ /_/\____/\___/_/|_|\__,_/ -\033[0m' -echo -e "\033[35;1mInstalling knockd to control ssh port opening\033[0m" +\033[0m\n' +printf "\033[35;1mInstalling knockd to control ssh port opening\033[0m\n" if [ "$(id -u)" -ne 0 ]; then echo "Please run as root" @@ -50,7 +50,7 @@ Alias=knockd.service" >> /lib/systemd/system/knockd.service systemctl enable knockd systemctl start knockd -echo -e "\033[92;1mknockd installed and configured\033[Om" -echo -e "\033[92;1mplease note this sequence for future ssh knocking\033[Om" +printf "\033[92;1mknockd installed and configured\033[Om\n" +printf "\033[92;1mplease note this sequence for future ssh knocking\033[Om\n" echo "$sq" sleep 3 diff --git a/bin/lemp.sh b/bin/lemp.sh index 774767a..26aaea1 100755 --- a/bin/lemp.sh +++ b/bin/lemp.sh @@ -1,14 +1,14 @@ #!/bin/sh -echo -e '\033[35m +printf '\033[35m __ / /__ ____ ___ ____ / / _ \/ __ `__ \/ __ \ / / __/ / / / / / /_/ / /_/\___/_/ /_/ /_/ .___/ /_/ -\033[0m' -echo -e "\033[35;1mLEMP server (Nginx Mysql Php-fpm) \033[0m" +\033[0m\n' +printf "\033[35;1mLEMP server (Nginx Mysql Php-fpm) \033[0m\n" if [ "$(id -u)" -ne 0 ]; then echo "Please run as root" @@ -29,22 +29,22 @@ fi sleep 2 -echo -e '\033[35m +printf '\033[35m ____ __ ______ / __ \/ / / / __ \ / /_/ / /_/ / /_/ / / ____/ __ / ____/ /_/ /_/ /_/_/ -\033[0m' +\033[0m\n' -echo -e "\033[35;1mInstalling SURY \033[0m" +printf "\033[35;1mInstalling SURY \033[0m\n" sleep 3 apt-get --yes install ca-certificates apt-transport-https software-properties-common curl lsb-release curl -sSL https://packages.sury.org/php/README.txt | bash -x apt-get update && apt-get --yes upgrade -echo -e "\033[35;1mInstalling PHP \033[0m" +printf "\033[35;1mInstalling PHP \033[0m\n" sleep 3 @@ -88,17 +88,17 @@ systemctl start php${PHP_VERSION}-fpm # # systemctl start memcached -echo -e "\033[92;1mphp installed\033[Om" +printf "\033[92;1mphp installed\033[Om\n" -echo -e '\033[35m +printf '\033[35m _ __ _ / | / /___ _(_)___ _ __ / |/ / __ `/ / __ \| |/_/ / /| / /_/ / / / / /> < /_/ |_/\__, /_/_/ /_/_/|_| /____/ -\033[0m' -echo -e "\033[35;1mInstalling Nginx \033[0m" +\033[0m\n' +printf "\033[35;1mInstalling Nginx \033[0m\n" sleep 3 apt-get --yes install nginx mv /etc/nginx/sites-available/default /etc/nginx/sites-available/default.ori @@ -107,7 +107,7 @@ sed -i "s/PHP_FPM_SOCK/php${PHP_VERSION}-fpm.sock/g" /etc/nginx/sites-available/ systemctl enable nginx systemctl restart nginx -echo -e "\033[92;1mNginx installed\033[Om" +printf "\033[92;1mNginx installed\033[Om\n" @@ -119,15 +119,15 @@ read installmysql done if [ "$installmysql" = "yes" ]; then - echo -e '\033[35m + printf '\033[35m __ ___ __ / |/ /_ ___________ _/ / / /|_/ / / / / ___/ __ `/ / / / / / /_/ (__ ) /_/ / / /_/ /_/\__, /____/\__, /_/ /____/ /_/ - \033[0m' - echo -e "\033[35;1minstalling Mysql \033[0m" + \033[0m\n' + printf "\033[35;1minstalling Mysql \033[0m\n" sleep 3 apt-get --yes install mariadb-server mysql_secure_installation @@ -139,17 +139,17 @@ if [ "$installmysql" = "yes" ]; then systemctl enable mariadb.service systemctl restart mariadb.service - echo -e "\033[92;1mmysql installed\033[Om" + printf "\033[92;1mmysql installed\033[Om\n" - echo -e '\033[35m + printf '\033[35m __ __ ___ ___ __ _ ____ / /_ ____ / |/ /_ __/ | ____/ /___ ___ (_)___ / __ \/ __ \/ __ \/ /|_/ / / / / /| |/ __ / __ `__ \/ / __ \ / /_/ / / / / /_/ / / / / /_/ / ___ / /_/ / / / / / / / / / / / .___/_/ /_/ .___/_/ /_/\__, /_/ |_\__,_/_/ /_/ /_/_/_/ /_/ /_/ /_/ /____/ - \033[0m' - echo -e "\033[35;1mInstalling phpMyAdmin \033[0m" + \033[0m\n' + printf "\033[35;1mInstalling phpMyAdmin \033[0m\n" ##### Building dependency tree ##### Reading state information... Done ##### Package phpmyadmin is not available, but is referred to by another package. @@ -166,8 +166,8 @@ if [ "$installmysql" = "yes" ]; then cp "$_assets"/nginx-phpmyadmin.conf /etc/nginx/sites-available/phpmyadmin.conf sed -i "s/PHP_FPM_SOCK/php${PHP_VERSION}-fpm.sock/g" /etc/nginx/sites-available/phpmyadmin.conf - echo -e "\033[92;1mphpMyAdmin installed\033[Om" - echo -e "\033[92;1mYou can access it at yourip/phpmyadmin\033[Om" + printf "\033[92;1mphpMyAdmin installed\033[Om\n" + printf "\033[92;1mYou can access it at yourip/phpmyadmin\033[Om\n" # install from source # apt-get --yes install php-{mbstring,zip,gd,xml,pear,gettext,cgi} @@ -178,21 +178,21 @@ if [ "$installmysql" = "yes" ]; then # rm phpMyAdmin-latest-all-languages.zip # # cp "$_assets"/nginx-phpmyadmin.conf > /etc/nginx/sites-available/phpmyadmin.conf # # ln -s /etc/nginx/sites-available/phpmyadmin.conf /etc/nginx/sites-enabled/phpmyadmin.conf - # echo -e "\033[92;1mphpMyAdmin installed\033[Om" - # echo -e "\033[92;1mYou can access it at yourip/pma\033[Om" + # printf "\033[92;1mphpMyAdmin installed\033[Om\n" + # printf "\033[92;1mYou can access it at yourip/pma\033[Om\n" fi -echo -e '\033[35m +printf '\033[35m ____ ___ / __ \___ ____/ (_)____ / /_/ / _ \/ __ / / ___/ / _, _/ __/ /_/ / (__ ) /_/ |_|\___/\__,_/_/____/ -\033[0m' -echo -e "\033[35;1mInstalling Redis \033[0m" +\033[0m\n' +printf "\033[35;1mInstalling Redis \033[0m\n" sleep 3 apt-get --yes install redis-server php${PHP_VERSION}-redis @@ -209,34 +209,34 @@ apt-get --yes install redis-server php${PHP_VERSION}-redis systemctl enable redis-server systemctl restart redis-server systemctl restart php${PHP_VERSION}-fpm -echo -e "\033[92;1mRedis installed\033[Om" +printf "\033[92;1mRedis installed\033[Om\n" -echo -e '\033[35m +printf '\033[35m ______ / ____/___ ____ ___ ____ ____ ________ _____ / / / __ \/ __ `__ \/ __ \/ __ \/ ___/ _ \/ ___/ / /___/ /_/ / / / / / / /_/ / /_/ (__ ) __/ / \____/\____/_/ /_/ /_/ .___/\____/____/\___/_/ /_/ -\033[0m' -echo -e "\033[35;1mInstalling Composer \033[0m" +\033[0m\n' +printf "\033[35;1mInstalling Composer \033[0m\n" sleep 3 export COMPOSER_HOME=/usr/local/composer curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer -echo -e "\033[92;1mComposer installed\033[Om" +printf "\033[92;1mComposer installed\033[Om\n" -echo -e '\033[35m +printf '\033[35m ____ __ / __ \_______ _______/ /_ / / / / ___/ / / / ___/ __ \ / /_/ / / / /_/ (__ ) / / / /_____/_/ \__,_/____/_/ /_/ -\033[0m' -echo -e "\033[35;1mInstalling Drush\033[0m" +\033[0m\n' +printf "\033[35;1mInstalling Drush\033[0m\n" sleep 3 # curl https://github.com/drush-ops/drush-launcher/releases/download/0.6.0/drush.phar -L -o /usr/local/bin/drush wget -O /usr/local/bin/drush https://github.com/drush-ops/drush-launcher/releases/latest/download/drush.phar chmod +x /usr/local/bin/drush -echo -e "\033[92;1mDrush\033[Om" +printf "\033[92;1mDrush\033[Om\n" diff --git a/bin/misc.sh b/bin/misc.sh index a4e7b74..208604d 100755 --- a/bin/misc.sh +++ b/bin/misc.sh @@ -1,13 +1,13 @@ #!/bin/sh -echo -e '\033[35m +printf '\033[35m __ ____ / |/ (_)_________ / /|_/ / / ___/ ___/ / / / / (__ ) /__ /_/ /_/_/____/\___/ -\033[0m' +\033[0m\n' if [ "$(id -u)" -ne 0 ]; then echo "Please run as root" @@ -28,4 +28,4 @@ apt-get --yes install tmux etckeeper needrestart htop lynx unzip nfs-common -echo -e "\033[92;1mMisc done \033[Om" +printf "\033[92;1mMisc done \033[Om\n" diff --git a/bin/mysql-db.sh b/bin/mysql-db.sh index 00515b0..4f80470 100755 --- a/bin/mysql-db.sh +++ b/bin/mysql-db.sh @@ -1,13 +1,13 @@ #!/bin/sh -echo -e ' +printf ' _ _ _ _ __| | |__ | | | |___ ___ _ _ / _` | _ \ | |_| (_-> /etc/ssh/sshd_config.d/custom.conf echo "PermitEmptyPasswords no" >> /etc/ssh/sshd_config.d/custom.conf systemctl reload ssh -echo -e "\033[92;1mSSH secured\033[Om" +printf "\033[92;1mSSH secured\033[Om\n" diff --git a/bin/upgrade.sh b/bin/upgrade.sh index d125fb4..6b327b1 100755 --- a/bin/upgrade.sh +++ b/bin/upgrade.sh @@ -2,13 +2,13 @@ # TODO check if root -echo -e '\033[35m +printf '\033[35m __ ______ __________ ___ ____ ______ / / / / __ \/ ____/ __ \/ | / __ \/ ____/ / / / / /_/ / / __/ /_/ / /| | / / / / __/ / /_/ / ____/ /_/ / _, _/ ___ |/ /_/ / /___ \____/_/ \____/_/ |_/_/ |_/_____/_____/ -\033[0m' +\033[0m\n' if [ "$(id -u)" -ne 0 ]; then echo "Please run as root" diff --git a/bin/urbackup.sh b/bin/urbackup.sh index 5506ea8..898ce21 100755 --- a/bin/urbackup.sh +++ b/bin/urbackup.sh @@ -1,13 +1,13 @@ #!/bin/sh -echo -e '\033[35m +printf '\033[35m _ _ _ _ ___ _ _ _ | | | |_ _| |__ __ _ __| |___ _ _ __ / __| | (_)___ _ _| |_ | |_| | _| _ \/ _` / _| / / || | _ \ | (__| |__| / -_) \ _| \___/|_| |_.__/\__,_\__|_\_\\_,_| .__/ \___|____|_\___|_||_\__| |_| -\033[0m' +\033[0m\n' if [ "$(id -u)" -ne 0 ]; then echo "Please run as root" diff --git a/bin/user.sh b/bin/user.sh index 483a0ea..970ad22 100755 --- a/bin/user.sh +++ b/bin/user.sh @@ -1,13 +1,13 @@ #!/bin/sh -echo -e '\033[35m +printf '\033[35m __ _______ __________ / / / / ___// ____/ __ \ / / / /\__ \/ __/ / /_/ / / /_/ /___/ / /___/ _, _/ \____//____/_____/_/ |_| -\033[0m' -echo -e "\033[35;1mCreate new user (you will be asked a user name and a password) \033[0m" +\033[0m\n' +printf "\033[35;1mCreate new user (you will be asked a user name and a password) \033[0m\n" if [ "$(id -u)" -ne 0 ]; then echo "Please run as root" @@ -43,4 +43,4 @@ groupadd admin usermod -a -G admin "$user" # allow admin group to su dpkg-statoverride --update --add root admin 4750 /bin/su -echo -e "\033[92;1muser $user configured\033[Om" +printf "\033[92;1muser $user configured\033[Om\n" diff --git a/bin/vhost.sh b/bin/vhost.sh index 88f3d0c..08fc592 100755 --- a/bin/vhost.sh +++ b/bin/vhost.sh @@ -1,12 +1,12 @@ -echo -e '\033[35m +printf '\033[35m __ __ _ __/ /_ ____ _____/ /_ | | / / __ \/ __ \/ ___/ __/ | |/ / / / / /_/ (__ ) /_ |___/_/ /_/\____/____/\__/ -\033[0m' -echo -e "\033[35;1mNginx VHOST install \033[0m" +\033[0m\n' +printf "\033[35;1mNginx VHOST install \033[0m\n" while [ "$vh" != "y" ] && [ "$vh" != "n" ] do echo -n "Should we install a vhost? [y|n] " @@ -53,7 +53,7 @@ if [ "$vh" = "y" ]; then _letsencrypt="" while [ "$_letsencrypt" != "yes" ] && [ "$_letsencrypt" != "no" ] do - echo -e "\033[35;1mLet's encrypt \033[0m" + printf "\033[35;1mLet's encrypt \033[0m\n" echo "Let's encrypt needs a public registered domain name with proper DNS records ( A records or CNAME records for subdomains pointing to your server)." echo -n "Should we install let's encrypt certificate with $_domain? [yes|no] " read _letsencrypt @@ -162,7 +162,7 @@ if [ "$vh" = "y" ]; then # restart nginx systemctl restart nginx - echo -e "\033[92;1mvhost $_domain configured \033[Om" + printf "\033[92;1mvhost $_domain configured \033[Om\n" else echo "Vhost installation aborted" fi diff --git a/bin/webhook.sh b/bin/webhook.sh index 521b243..60a8ec2 100755 --- a/bin/webhook.sh +++ b/bin/webhook.sh @@ -5,12 +5,12 @@ # get the current position _cwd="$(pwd)" -echo -e '\033[35m +printf '\033[35m __ __ _ _ _ _ \ \ / /__| |__| || |___ ___| |__ \ \/\/ / -_) `_ \ __ / _ \/ _ \ / / \_/\_/\___|_.__/_||_\___/\___/_\_\ -\033[0m' +\033[0m\n' # check for assets folder _assets="$_cwd/assets" diff --git a/bin/zabbix.sh b/bin/zabbix.sh index b576eda..2c3a19d 100755 --- a/bin/zabbix.sh +++ b/bin/zabbix.sh @@ -1,13 +1,13 @@ #!/bin/sh -echo -e '\033[35m +printf '\033[35m _____ __ __ _ /__ / ____ _/ /_ / /_ (_) __ / / / __ `/ __ \/ __ \/ / |/_/ / /__/ /_/ / /_/ / /_/ / /> < /____/\__,_/_.___/_.___/_/_/|_| -\033[0m' +\033[0m\n' if [ "$(id -u)" -ne 0 ]; then echo "Please run as root" @@ -134,6 +134,6 @@ ufw allow from "$_ip" to any port 22 systemctl restart zabbix-agent systemctl enable zabbix-agent -echo -e "\033[92;1mZabbix-agent installed and configured, please add the host $_host_name in your zabbix-server \033[Om" -echo -e "\033[92;1mAnd import requested templates in assets/zabbix/templates/ \033[Om" -echo -e "\033[92;1mzabbix user mysql password is $_passwd \033[Om" +printf "\033[92;1mZabbix-agent installed and configured, please add the host $_host_name in your zabbix-server \033[Om\n" +printf "\033[92;1mAnd import requested templates in assets/zabbix/templates/ \033[Om\n" +printf "\033[92;1mzabbix user mysql password is $_passwd \033[Om\n" diff --git a/install.sh b/install.sh index 59fe866..d6934ff 100755 --- a/install.sh +++ b/install.sh @@ -5,15 +5,15 @@ # http://web-74.com/blog/reseaux/gerer-le-deploiement-facilement-avec-git/ # -echo -e '\033[35m +printf '\033[35m ____ __ _ _____ / __ \___ / /_ (_)___ _____ / ___/___ ______ _____ _____ / / / / _ \/ __ \/ / __ `/ __ \ \__ \/ _ \/ ___/ | / / _ \/ ___/ / /_/ / __/ /_/ / / /_/ / / / / ___/ / __/ / | |/ / __/ / /_____/\___/_.___/_/\__,_/_/ /_/ /____/\___/_/ |___/\___/_/ -\033[0m' -echo -e "\033[35;1mThis script has been tested only on Linux Debian 10 \033[0m" +\033[0m\n' +printf "\033[35;1mThis script has been tested only on Linux Debian 10 \033[0m\n" if [ "$(id -u)" -ne 0 ]; then echo "Please run as root" @@ -111,13 +111,13 @@ fi # . bin/autoupdate.sh -# echo -e '\033[35m +# printf '\033[35m # ______________ _______ # /_ __/ ____/ |/ / __ \ # / / / __/ / /|_/ / /_/ / # / / / /___/ / / / ____/ # /_/ /_____/_/ /_/_/ -# \033[0m' +# \033[0m\n' # function check_tmp_secured { # temp1=`grep -w "/var/tempFS /tmp ext3 loop,nosuid,noexec,rw 0 0" /etc/fstab | wc -l` @@ -158,14 +158,14 @@ fi # # Remove old tmp dir # rm -rf /var/tmpbackup -# echo -e "\033[35;1m /tmp and /var/tmp secured using tmpfs. \033[0m" +# printf "\033[35;1m /tmp and /var/tmp secured using tmpfs. \033[0m\n" # } # End function secure_tmp_tmpfs # check_tmp_secured # if [ $? = 0 ]; then # secure_tmp_tmpfs # else -# echo -e "\033[35;1mFunction canceled. /tmp already secured. \033[0m" +# printf "\033[35;1mFunction canceled. /tmp already secured. \033[0m\n" # fi # TODO add warning message on ssh connection if system needs updates @@ -174,11 +174,11 @@ fi -echo -e '\033[35m +printf '\033[35m __ ___ ____ ____/ / / _ \/ __ \/ __ / / __/ / / / /_/ / \___/_/ /_/\__,_/ -\033[0m' -echo -e "\033[35;1m* * script done * * \033[0m" +\033[0m\n' +printf "\033[35;1m* * script done * * \033[0m\n"