From 3255b0d913456bab9a4b35441873ccde48371443 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Tue, 25 Oct 2022 22:47:02 +0200 Subject: [PATCH] update console output --- usr/lib/archboot/gnome-wayland.sh | 4 ++-- usr/lib/archboot/gnome.sh | 4 ++-- usr/lib/archboot/plasma-wayland.sh | 4 ++-- usr/lib/archboot/plasma.sh | 4 ++-- usr/lib/archboot/update-installer.sh | 16 ++++++++-------- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/usr/lib/archboot/gnome-wayland.sh b/usr/lib/archboot/gnome-wayland.sh index 37ec922bd..e90e7e0ef 100644 --- a/usr/lib/archboot/gnome-wayland.sh +++ b/usr/lib/archboot/gnome-wayland.sh @@ -7,8 +7,8 @@ _install_gnome_wayland() { } _start_gnome_wayland() { - echo -e "Launching GNOME Wayland now, logging is done on \033[1m/dev/tty7\033[0m ..." - echo -e "To relaunch GNOME Wayland use: \033[92mgnome-wayland\033[0m" + echo -e "Launching \033[1mGNOME Wayland\033[0m now, logging is done on \033[1m/dev/tty7\033[0m ..." + echo -e "To relaunch \033[1mGNOME Wayland\033[0m use: \033[92mgnome-wayland\033[0m" echo "LANG=C.UTF-8 MOZ_ENABLE_WAYLAND=1 QT_QPA_PLATFORM=wayland XDG_SESSION_TYPE=wayland exec dbus-run-session gnome-session >/dev/tty7 2>&1" > /usr/bin/gnome-wayland chmod 755 /usr/bin/gnome-wayland diff --git a/usr/lib/archboot/gnome.sh b/usr/lib/archboot/gnome.sh index d5bb7da56..8a71de79e 100644 --- a/usr/lib/archboot/gnome.sh +++ b/usr/lib/archboot/gnome.sh @@ -7,12 +7,12 @@ _install_gnome() { } _start_gnome() { - echo -e "Launching GNOME now, logging is done on \033[1m/dev/tty8\033[0m ..." + echo -e "Launching \033[1mGNOME\033[0m now, logging is done on \033[1m/dev/tty8\033[0m ..." echo "export XDG_SESSION_TYPE=x11" > /root/.xinitrc #shellcheck disable=SC2129 echo "export GDK_BACKEND=x11" >> /root/.xinitrc echo "export LANG=C.UTF-8" >> /root/.xinitrc echo "exec dbus-launch gnome-session" >> /root/.xinitrc startx >/dev/tty8 2>&1 - echo -e "To relaunch GNOME desktop use: \033[92mstartx\033[0m" + echo -e "To relaunch \033[1mGNOME\033[0m desktop use: \033[92mstartx\033[0m" } diff --git a/usr/lib/archboot/plasma-wayland.sh b/usr/lib/archboot/plasma-wayland.sh index 17fde50cf..8cebdef5e 100644 --- a/usr/lib/archboot/plasma-wayland.sh +++ b/usr/lib/archboot/plasma-wayland.sh @@ -7,8 +7,8 @@ _install_plasma_wayland() { } _start_plasma_wayland() { - echo -e "Launching KDE/Plasma Wayland now, logging is done on \033[1m/dev/tty7\033[0m ..." - echo -e "To relaunch KDE/Plasma Wayland use: \033[92mplasma-wayland\033[0m" + echo -e "Launching \033[1mKDE/Plasma Wayland\033[0m now, logging is done on \033[1m/dev/tty7\033[0m ..." + echo -e "To relaunch \033[1mKDE/Plasma Wayland\033[0m use: \033[92mplasma-wayland\033[0m" echo "exec dbus-run-session startplasma-wayland >/dev/tty7 2>&1" > /usr/bin/plasma-wayland chmod 755 /usr/bin/plasma-wayland plasma-wayland diff --git a/usr/lib/archboot/plasma.sh b/usr/lib/archboot/plasma.sh index 889b31a84..fb0367866 100644 --- a/usr/lib/archboot/plasma.sh +++ b/usr/lib/archboot/plasma.sh @@ -7,9 +7,9 @@ _install_plasma() { } _start_plasma() { - echo -e "Launching KDE/Plasma now, logging is done on \033[1m/dev/tty8\033[0m ..." + echo -e "Launching \033[1mKDE/Plasma\033[0m now, logging is done on \033[1m/dev/tty8\033[0m ..." echo "export DESKTOP_SESSION=plasma" > /root/.xinitrc echo "exec startplasma-x11" >> /root/.xinitrc startx >/dev/tty8 2>&1 - echo -e "To relaunch KDE desktop use: \033[92mstartx\033[0m" + echo -e "To relaunch \033[1mKDE/Plasma033[0m desktop use: \033[92mstartx\033[0m" } diff --git a/usr/lib/archboot/update-installer.sh b/usr/lib/archboot/update-installer.sh index 82f7d1427..d5fa57c60 100644 --- a/usr/lib/archboot/update-installer.sh +++ b/usr/lib/archboot/update-installer.sh @@ -518,29 +518,29 @@ _hint_graphic_installed () { _prepare_gnome() { if ! [[ -e /usr/bin/gnome-session ]]; then - echo -e "\033[1mStep 1/3:\033[0m Installing GNOME desktop now ..." + echo -e "\033[1mStep 1/4:\033[0m Installing GNOME desktop now ..." echo " This will need some time ..." _prepare_graphic "${_PACKAGES}" >/dev/tty7 2>&1 - echo -e "\033[1mStep 2/3:\033[0m Configuring GNOME desktop ..." + echo -e "\033[1mStep 2/4:\033[0m Configuring GNOME desktop ..." _configure_gnome >/dev/tty7 2>&1 systemd-sysusers >/dev/tty7 2>&1 systemd-tmpfiles --create >/dev/tty7 2>&1 else - echo -e "\033[1mStep 1/3:\033[0m Installing GNOME desktop already done ..." - echo -e "\033[1mStep 2/3:\033[0m Configuring GNOME desktop already done ..." + echo -e "\033[1mStep 1/4:\033[0m Installing GNOME desktop already done ..." + echo -e "\033[1mStep 2/4:\033[0m Configuring GNOME desktop already done ..." fi } _prepare_plasma() { if ! [[ -e /usr/bin/startplasma-x11 ]]; then - echo -e "\033[1mStep 1/3:\033[0m Installing KDE/Plasma desktop now ..." + echo -e "\033[1mStep 1/4:\033[0m Installing KDE/Plasma desktop now ..." echo " This will need some time ..." _prepare_graphic "${_PACKAGES}" >/dev/tty7 2>&1 - echo -e "\033[1mStep 2/3:\033[0m Configuring KDE desktop ..." + echo -e "\033[1mStep 2/4:\033[0m Configuring KDE desktop ..." _configure_plasma >/dev/tty7 2>&1 else - echo -e "\033[1mStep 1/3:\033[0m Installing KDE/Plasma desktop already done ..." - echo -e "\033[1mStep 2/3:\033[0m Configuring KDE desktop already done ..." + echo -e "\033[1mStep 1/4:\033[0m Installing KDE/Plasma desktop already done ..." + echo -e "\033[1mStep 2/4:\033[0m Configuring KDE desktop already done ..." fi }