diff --git a/setup/mariadb_setup.sh b/setup/mariadb_setup.sh index 2b56d74e..bbf2c626 100644 --- a/setup/mariadb_setup.sh +++ b/setup/mariadb_setup.sh @@ -7,7 +7,11 @@ set -o pipefail shopt -s expand_aliases alias die='EXIT=$? LINE=$LINENO error_exit' CROSS='\033[1;31m\xE2\x9D\x8C\033[0m' -CHECKMARK='\033[0;32m\xE2\x9C\x94\033[0m' +RD=`echo "\033[01;31m"` +BL=`echo "\033[36m"` +CM='\xE2\x9C\x94\033' +GN=`echo "\033[1;92m"` +CL=`echo "\033[m"` RETRY_NUM=5 RETRY_EVERY=3 NUM=$RETRY_NUM @@ -27,42 +31,48 @@ function msg() { echo -e "$TEXT" } -echo -e "${CHECKMARK} \e[1;92m Setting up Container OS... \e[0m" +echo -en "${GN} Setting up Container OS... " sed -i "/$LANG/ s/\(^# \)//" /etc/locale.gen locale-gen >/dev/null while [ "$(hostname -I)" = "" ]; do - 1>&2 echo -e "${CROSS} \e[1;31m No Network: \e[0m $(date)" + 1>&2 echo -e "${CROSS}${RD} No Network! \r" sleep $RETRY_EVERY ((NUM--)) if [ $NUM -eq 0 ] then - 1>&2 echo -e "${CROSS} \e[1;31m No Network After $RETRY_NUM Tries \e[0m" + 1>&2 echo -e "${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" exit 1 fi done - echo -e "${CHECKMARK} \e[1;92m Network Connected: \e[0m $(hostname -I)" +echo -e "${CM}${CL} \r" +echo -en "${GN} Network Connected: ${BL}${(hostname -I)} " +echo -e "${CM}${CL} \r" -echo -e "${CHECKMARK} \e[1;92m Updating Container OS... \e[0m" +echo -en "${GN} Updating Container OS... " apt-get update &>/dev/null apt-get -qqy upgrade &>/dev/null +echo -e "${CM}${CL} \r" -echo -e "${CHECKMARK} \e[1;92m Installing Dependencies... \e[0m" +echo -en "${GN} Installing Dependencies... " apt-get update &>/dev/null apt-get -qqy install \ curl \ sudo &>/dev/null +echo -e "${CM}${CL} \r" -echo -e "${CHECKMARK} \e[1;92m Installing MariaDB... \e[0m" +echo -en "${GN} Installing MariaDB... " curl -LsS https://r.mariadb.com/downloads/mariadb_repo_setup | sudo bash &>/dev/null apt-get update >/dev/null apt-get install -y mariadb-server &>/dev/null +echo -e "${CM}${CL} \r" -echo -e "${CHECKMARK} \e[1;92m Installing Adminer... \e[0m" +echo -en "${GN} Installing Adminer... " sudo apt install adminer -y &>/dev/null sudo a2enconf adminer &>/dev/null sudo systemctl reload apache2 &>/dev/null +echo -e "${CM}${CL} \r" -echo -e "${CHECKMARK} \e[1;92m Customizing Container... \e[0m" +echo -en "${GN} Customizing Container... " rm /etc/motd rm /etc/update-motd.d/10-uname touch ~/.hushlogin @@ -75,7 +85,9 @@ ExecStart=-/sbin/agetty --autologin root --noclear --keep-baud tty%I 115200,3840 EOF systemctl daemon-reload systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') +echo -e "${CM}${CL} \r" -echo -e "${CHECKMARK} \e[1;92m Cleanup... \e[0m" +echo -en "${GN} Cleanup... " rm -rf /mariadb_setup.sh /var/{cache,log}/* /var/lib/apt/lists/* mkdir /var/log/apache2 +echo -e "${CM}${CL} \r"