From 184480589ce79d079feef515dc53f8dc5dc43c4d Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Tue, 25 Oct 2022 22:35:00 +0200 Subject: [PATCH] update xfce console output --- usr/lib/archboot/login.sh | 2 +- usr/lib/archboot/update-installer.sh | 15 +++++++-------- usr/lib/archboot/xfce.sh | 12 ++++++------ 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/usr/lib/archboot/login.sh b/usr/lib/archboot/login.sh index 0174d7d87..902f0858e 100644 --- a/usr/lib/archboot/login.sh +++ b/usr/lib/archboot/login.sh @@ -11,7 +11,7 @@ _welcome () { _local_mode () { if [[ -e /var/cache/pacman/pkg/archboot.db ]]; then echo -e "You are running in \033[92m\033[1mLocal mode\033[0m, with \033[1mlocal package repository\033[0m enabled.\033[0m" - echo -e "To \033[1mswitch\033[0m to \033[1mOnline mode\033[0m:# \033[1m\033[91mrm /var/cache/pacman/pkg/archboot.db\033[0m\033[1m" + echo -e "To \033[1mswitch\033[0m to \033[1mOnline mode\033[0m:\033[1m\033[91m# rm /var/cache/pacman/pkg/archboot.db\033[0m\033[1m" echo "" fi } diff --git a/usr/lib/archboot/update-installer.sh b/usr/lib/archboot/update-installer.sh index 590fa24cc..82f7d1427 100644 --- a/usr/lib/archboot/update-installer.sh +++ b/usr/lib/archboot/update-installer.sh @@ -199,7 +199,6 @@ _initialize_zram_usr() { else echo -e "\033[1mStep 2/2:\033[0m Move /usr to /usr.zram already done ..." fi - echo -e "\033[1mFinished.\033[0m" } _umount_w_dir() { @@ -472,7 +471,6 @@ _full_system() { _home_root_mount echo -e "\033[1mStep 3/3:\033[0m Checking kernel version ..." _kernel_check - echo -e "\033[1mFinished.\033[0m" echo -e "\033[1mFull Arch Linux system is ready now.\033[0m" touch /.full_system } @@ -492,15 +490,16 @@ _new_image() { _install_graphic () { _initialize_zram_usr [[ -e /var/cache/pacman/pkg/archboot.db ]] && touch /.graphic_installed + echo -e "\033[1mInitializing desktop environment ...\033[0m" [[ "${_L_XFCE}" == "1" ]] && _install_xfce [[ "${_L_GNOME}" == "1" ]] && _install_gnome [[ "${_L_GNOME_WAYLAND}" == "1" ]] && _install_gnome_wayland [[ "${_L_PLASMA}" == "1" ]] && _install_plasma [[ "${_L_PLASMA_WAYLAND}" == "1" ]] && _install_plasma_wayland - echo -e "\033[1mStep 3/3:\033[0m Starting avahi-daemon ..." + echo -e "\033[1mStep 3/4:\033[0m Starting avahi-daemon ..." systemctl start avahi-daemon.service # only start vnc on xorg environment - echo -e "\033[1mSetting up VNC and browser ...\033[0m" + echo -e "\033[1mStep 4/4:\033[0m Setting up VNC and browser ...\033[0m" [[ "${_L_XFCE}" == "1" || "${_L_PLASMA}" == "1" || "${_L_GNOME}" == "1" ]] && _autostart_vnc which firefox > /dev/null 2>&1 && _firefox_flags which chromium > /dev/null 2>&1 && _chromium_flags @@ -645,7 +644,7 @@ _custom_wayland_xorg() { } _chromium_flags() { - echo "Adding chromium flags to /etc/chromium-flags.conf ..." + echo "Adding chromium flags to /etc/chromium-flags.conf ..." >/dev/tty7 cat << EOF >/etc/chromium-flags.conf --no-sandbox --test-type @@ -657,7 +656,7 @@ EOF _firefox_flags() { if [[ -f "/usr/lib/firefox/browser/defaults/preferences/vendor.js" ]]; then if ! grep -q startup /usr/lib/firefox/browser/defaults/preferences/vendor.js; then - echo "Adding firefox flags vendor.js ..." + echo "Adding firefox flags vendor.js ..." >/dev/tty7 cat << EOF >> /usr/lib/firefox/browser/defaults/preferences/vendor.js pref("browser.aboutwelcome.enabled", false, locked); pref("browser.startup.homepage_override.once", false, locked); @@ -668,10 +667,10 @@ EOF } _autostart_vnc() { - echo "Setting VNC password /etc/tigervnc/passwd to ${_VNC_PW} ..." + echo "Setting VNC password /etc/tigervnc/passwd to ${_VNC_PW} ..." >/dev/tty7 echo "${_VNC_PW}" | vncpasswd -f > /etc/tigervnc/passwd cp /etc/xdg/autostart/archboot.desktop /usr/share/applications/archboot.desktop - echo "Autostarting tigervnc ..." + echo "Autostarting tigervnc ..." >/dev/tty7 cat << EOF > /etc/xdg/autostart/tigervnc.desktop [Desktop Entry] Type=Application diff --git a/usr/lib/archboot/xfce.sh b/usr/lib/archboot/xfce.sh index f143c9f3b..0565134ef 100644 --- a/usr/lib/archboot/xfce.sh +++ b/usr/lib/archboot/xfce.sh @@ -3,14 +3,14 @@ _install_xfce() { if ! [[ -e /usr/bin/startxfce4 ]]; then - echo -e "\033[1mStep 1/3:\033[0m Installing XFCE desktop now ..." + echo -e "\033[1mStep 1/4:\033[0m Installing XFCE desktop now ..." echo " This will need some time ..." _prepare_graphic "${_XORG_PACKAGE} ${_VNC_PACKAGE} ${_STANDARD_PACKAGES} ${_STANDARD_BROWSER} ${_XFCE_PACKAGES}" >/dev/tty7 2>&1 - echo -e "\033[1mStep 2/3:\033[0m Configuring XFCE desktop ..." + echo -e "\033[1mStep 2/4:\033[0m Configuring XFCE desktop ..." _configure_xfce >/dev/tty7 2>&1 else - echo -e "\033[1mStep 1/3:\033[0m Installing XFCE desktop already done ..." - echo -e "\033[1mStep 2/3:\033[0m Configuring XFCE desktop already done ..." + echo -e "\033[1mStep 1/4:\033[0m Installing XFCE desktop already done ..." + echo -e "\033[1mStep 2/4:\033[0m Configuring XFCE desktop already done ..." fi } @@ -251,7 +251,7 @@ EOF } _start_xfce() { - echo -e "Launching XFCE now, logging is done on \033[1m/dev/tty8\033[0m ..." + echo -e "Launching \033[1mXFCE\033[0m now, logging is done on \033[1m/dev/tty8\033[0m ..." startxfce4 >/dev/tty8 2>&1 - echo -e "To relaunch XFCE desktop use: \033[92mstartxfce4\033[0m" + echo -e "To relaunch \033[1mXFCE\033[0m desktop use: \033[92mstartxfce4\033[0m" }