root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-19 19:40:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

rename -kde options to -plasma options, added wayland start scripts for gnome and kde

Browse source
This commit is contained in:
Tobias Powalowski 2022-06-06 12:19:44 +02:00
parent d4b0c282bb
commit d1d0e31fab
5 changed files with 29 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
usr/bin/archboot-update-installer.sh
View file

@ -7,8 +7,8 @@
. /usr/lib/archboot/xfce.sh . /usr/lib/archboot/xfce.sh
. /usr/lib/archboot/gnome.sh . /usr/lib/archboot/gnome.sh
. /usr/lib/archboot/gnome-wayland.sh . /usr/lib/archboot/gnome-wayland.sh
. /usr/lib/archboot/kde.sh . /usr/lib/archboot/plasma.sh
. /usr/lib/archboot/kde-wayland.sh . /usr/lib/archboot/plasma-wayland.sh
[[ -z "${1}" ]] && usage [[ -z "${1}" ]] && usage
@ -18,11 +18,11 @@ while [ $# -gt 0 ]; do
-latest|--latest) _L_COMPLETE="1" ;; -latest|--latest) _L_COMPLETE="1" ;;
-latest-install|--latest-install) _L_INSTALL_COMPLETE="1";; -latest-install|--latest-install) _L_INSTALL_COMPLETE="1";;
-latest-image|--latest-image) _G_RELEASE="1" ;; -latest-image|--latest-image) _G_RELEASE="1" ;;
-launch-xfce|--launch-xfce) _L_XFCE="1" ;; -xfce|--xfce) _L_XFCE="1" ;;
-launch-gnome|--launch-gnome) _L_GNOME="1";; -gnome|--gnome) _L_GNOME="1";;
-gnome-wayland|--gnome-wayland) _L_GNOME_WAYLAND="1";; -gnome-wayland|--gnome-wayland) _L_GNOME_WAYLAND="1";;
-launch-kde|--launch-kde) _L_KDE="1" ;; -plasma|--plasma) _L_PLASMA="1" ;;
-kde-wayland|--kde-wayland) _L_KDE_WAYLAND="1" ;; -plasma-wayland|--plasma-wayland) _L_PLASMA_WAYLAND="1" ;;
-custom-xorg|--custom-xorg) _CUSTOM_X="1" ;; -custom-xorg|--custom-xorg) _CUSTOM_X="1" ;;
-custom-wayland|--custom-wayland) _CUSTOM_WAYLAND="1" ;; -custom-wayland|--custom-wayland) _CUSTOM_WAYLAND="1" ;;
-h|--h|?) usage ;; -h|--h|?) usage ;;
@ -121,7 +121,7 @@ if [[ "${_CUSTOM_X}" == "1" || "${_CUSTOM_WAYLAND}" == "1" ]]; then
fi fi
# Gnome, KDE/PLASMA or XFCE launch # Gnome, KDE/PLASMA or XFCE launch
if [[ "${_L_XFCE}" == "1" || "${_L_KDE}" == "1" || "${_L_GNOME}" == "1" || "${_L_GNOME_WAYLAND}" == "1" || "${_L_KDE_WAYLAND}" == "1" ]]; then if [[ "${_L_XFCE}" == "1" || "${_L_PLASMA}" == "1" || "${_L_GNOME}" == "1" || "${_L_GNOME_WAYLAND}" == "1" || "${_L_PLASMA_WAYLAND}" == "1" ]]; then
if [[ -e "/.graphic_run" ]]; then if [[ -e "/.graphic_run" ]]; then
echo -e "\033[1m\033[91mError: Graphical environment already installed ...\033[0m" echo -e "\033[1m\033[91mError: Graphical environment already installed ...\033[0m"
else else
@ -137,18 +137,18 @@ if [[ "${_L_XFCE}" == "1" || "${_L_KDE}" == "1" || "${_L_GNOME}" == "1" || "${_L
[[ "${_L_XFCE}" == "1" ]] && _install_xfce [[ "${_L_XFCE}" == "1" ]] && _install_xfce
[[ "${_L_GNOME}" == "1" ]] && _install_gnome [[ "${_L_GNOME}" == "1" ]] && _install_gnome
[[ "${_L_GNOME_WAYLAND}" == "1" ]] && _install_gnome_wayland [[ "${_L_GNOME_WAYLAND}" == "1" ]] && _install_gnome_wayland
[[ "${_L_KDE}" == "1" ]] && _install_kde [[ "${_L_PLASMA}" == "1" ]] && _install_kde
[[ "${_L_KDE_WAYLAND}" == "1" ]] && _install_kde_wayland [[ "${_L_PLASMA_WAYLAND}" == "1" ]] && _install_kde_wayland
echo -e "\033[1mStep 5/5:\033[0m Starting avahi-daemon ..." echo -e "\033[1mStep 5/5:\033[0m Starting avahi-daemon ..."
systemctl start avahi-daemon.service systemctl start avahi-daemon.service
# only start vnc on xorg environment # only start vnc on xorg environment
[[ "${_L_XFCE}" == "1" || "${_L_KDE}" == "1" || "${_L_GNOME}" == "1" ]] && _autostart_vnc [[ "${_L_XFCE}" == "1" || "${_L_PLASMA}" == "1" || "${_L_GNOME}" == "1" ]] && _autostart_vnc
_chromium_flags _chromium_flags
[[ "${_L_XFCE}" == "1" ]] && _start_xfce [[ "${_L_XFCE}" == "1" ]] && _start_xfce
[[ "${_L_GNOME}" == "1" ]] && _start_gnome [[ "${_L_GNOME}" == "1" ]] && _start_gnome
[[ "${_L_GNOME_WAYLAND}" == "1" ]] && _start_gnome_wayland [[ "${_L_GNOME_WAYLAND}" == "1" ]] && _start_gnome_wayland
[[ "${_L_KDE}" == "1" ]] && _start_kde [[ "${_L_PLASMA}" == "1" ]] && _start_kde
[[ "${_L_KDE_WAYLAND}" == "1" ]] && _start_kde_wayland [[ "${_L_PLASMA_WAYLAND}" == "1" ]] && _start_kde_wayland
fi fi
fi fi

7
usr/lib/archboot/gnome-wayland.sh
View file

@ -41,6 +41,9 @@ EOF
_start_gnome_wayland() { _start_gnome_wayland() {
echo -e "Launching GNOME Wayland now, logging is done on \033[1m/dev/tty7\033[0m ..." echo -e "Launching GNOME Wayland now, logging is done on \033[1m/dev/tty7\033[0m ..."
echo -e "To relaunch GNOME Wayland use: \033[92mupdate-installer.sh -gnome-wayland\033[0m" echo -e "To relaunch GNOME Wayland use: \033[92mgnome-wayland\033[0m"
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
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
gnome-wayland
} }

6
usr/lib/archboot/kde-wayland.sh
View file

@ -74,6 +74,8 @@ EOF
_start_kde_wayland() { _start_kde_wayland() {
echo -e "Launching KDE/Plasma Wayland now, logging is done on \033[1m/dev/tty7\033[0m ..." 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[92mupdate-installer.sh -kde-wayland\033[0m" echo -e "To relaunch KDE/Plasma Wayland use: \033[92mplasma-wayland\033[0m"
exec dbus-run-session startplasma-wayland >/dev/tty7 2>&1 echo "exec dbus-run-session startplasma-wayland >/dev/tty7 2>&1" > /usr/bin/plasma-wayland
chmod 755 /usr/bin/plasma-wayland
plasma-wayland
} }

14
usr/lib/archboot/update-installer.sh
View file

@ -22,10 +22,10 @@ _latest_install() {
} }
_graphic_options() { _graphic_options() {
echo -e " \033[1m-launch-gnome\033[0m Launch Gnome desktop with VNC sharing enabled." echo -e " \033[1m-gnome\033[0m Launch Gnome desktop with VNC sharing enabled."
echo -e " \033[1m-gnome-wayland\033[0m Launch Gnome desktop with Wayland." echo -e " \033[1m-gnome-wayland\033[0m Launch Gnome desktop with Wayland backend."
echo -e " \033[1m-launch-kde\033[0m Launch KDE Plasma desktop with VNC sharing enabled." echo -e " \033[1m-plasma\033[0m Launch KDE Plasma desktop with VNC sharing enabled."
echo -e " \033[1m-kde-wayland\033[0m Launch KDE Plasma desktop with Wayland." echo -e " \033[1m-plasma-wayland\033[0m Launch KDE Plasma desktop with Wayland backend."
} }
usage () { usage () {
@ -42,7 +42,7 @@ usage () {
if [[ "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -gt 3860000 ]] ; then if [[ "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -gt 3860000 ]] ; then
if ! [[ -e "/.graphic_run" ]]; then if ! [[ -e "/.graphic_run" ]]; then
_graphic_options _graphic_options
echo -e " \033[1m-launch-xfce\033[0m Launch XFCE desktop with VNC sharing enabled." echo -e " \033[1m-xfce\033[0m Launch XFCE desktop with VNC sharing enabled."
echo "" echo ""
fi fi
fi fi
@ -52,7 +52,7 @@ usage () {
_graphic_options _graphic_options
fi fi
if [[ "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -gt 2500000 ]]; then if [[ "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -gt 2500000 ]]; then
echo -e " \033[1m-launch-xfce\033[0m Launch XFCE desktop with VNC sharing enabled." echo -e " \033[1m-xfce\033[0m Launch XFCE desktop with VNC sharing enabled."
echo -e " \033[1m-custom-xorg\033[0m Install custom X environment." echo -e " \033[1m-custom-xorg\033[0m Install custom X environment."
[[ "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -gt 3400000 ]] && echo -e " \033[1m-custom-wayland\033[0m Install custom Wayland environment." [[ "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -gt 3400000 ]] && echo -e " \033[1m-custom-wayland\033[0m Install custom Wayland environment."
echo "" echo ""
@ -110,7 +110,7 @@ _download_latest() {
for i in ${BINS}; do for i in ${BINS}; do
[[ -e "${_BIN}/${i}" ]] && wget -q "${_SOURCE}${_BIN}/archboot-${i}.sh?inline=false" -O "${_BIN}/${i}" [[ -e "${_BIN}/${i}" ]] && wget -q "${_SOURCE}${_BIN}/archboot-${i}.sh?inline=false" -O "${_BIN}/${i}"
done done
LIBS="common.sh container.sh release.sh iso.sh update-installer.sh xfce.sh gnome.sh gnome-wayland.sh kde.sh kde-wayland.sh login.sh" LIBS="common.sh container.sh release.sh iso.sh update-installer.sh xfce.sh gnome.sh gnome-wayland.sh plasma.sh plasma-wayland.sh login.sh"
for i in ${LIBS}; do for i in ${LIBS}; do
wget -q "${_SOURCE}${_LIB}/${i}?inline=false" -O "${_LIB}/${i}" wget -q "${_SOURCE}${_LIB}/${i}?inline=false" -O "${_LIB}/${i}"
done done

2
usr/lib/initcpio/install/archboot_installer_common
View file

@ -6,7 +6,7 @@ build ()
map add_file "/etc/archboot/defaults" "/usr/lib/archboot/common.sh" \ map add_file "/etc/archboot/defaults" "/usr/lib/archboot/common.sh" \
"/usr/lib/archboot/container.sh" "/usr/bin/archboot-$(uname -m)-create-container.sh" \ "/usr/lib/archboot/container.sh" "/usr/bin/archboot-$(uname -m)-create-container.sh" \
"/usr/lib/archboot/update-installer.sh" "/usr/lib/archboot/xfce.sh" \ "/usr/lib/archboot/update-installer.sh" "/usr/lib/archboot/xfce.sh" \
"/usr/lib/archboot/kde.sh" "/usr/lib/archboot/kde-wayland.sh" "/usr/lib/archboot/gnome.sh" \ "/usr/lib/archboot/plasma.sh" "/usr/lib/archboot/plasma-wayland.sh" "/usr/lib/archboot/gnome.sh" \
"/usr/lib/archboot/gnome-wayland.sh" "/usr/lib/archboot/login.sh" "/usr/lib/archboot/gnome-wayland.sh" "/usr/lib/archboot/login.sh"
add_file "/usr/bin/archboot-update-installer.sh" "/usr/bin/update-installer.sh" add_file "/usr/bin/archboot-update-installer.sh" "/usr/bin/update-installer.sh"
add_file "/usr/share/archboot/gpg/tpowa.gpg" add_file "/usr/share/archboot/gpg/tpowa.gpg"