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

replace _XORG with GRAPHICAL_PACKAGES

Browse source
This commit is contained in:
Tobias Powalowski 2022-06-03 22:40:15 +02:00
parent 654e377279
commit c11858ae41
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
etc/archboot/defaults
View file

@ -17,7 +17,7 @@ _XFCE_PACKAGES="xfce4 breeze-icons gvfs gvfs-smb thunar-archive-plugin file-roll
_GNOME_PACKAGES="gnome-desktop-4 gnome-shell gnome-terminal gnome-control-center nautilus gvfs-smb gthumb file-roller gedit" _GNOME_PACKAGES="gnome-desktop-4 gnome-shell gnome-terminal gnome-control-center nautilus gvfs-smb gthumb file-roller gedit"
### KDE defaults ### KDE defaults
# KDE/Plasma packages # KDE/Plasma packages
_KDE_PACKAGES="plasma-desktop konsole kscreen kate dolphin powerdevil ark gwenview" _KDE_PACKAGES="plasma-wayland-session plasma-desktop konsole kscreen kate dolphin powerdevil ark gwenview"
### Custom Graphical defaults ### Custom Graphical defaults
# Custom packages # Custom packages
_CUSTOM_XORG="" _CUSTOM_XORG=""

2
usr/lib/archboot/common.sh
View file

@ -11,7 +11,7 @@ _XORG_PACKAGE="xorg"
_VNC_PACKAGE="tigervnc" _VNC_PACKAGE="tigervnc"
_WAYLAND_PACKAGE="egl-wayland" _WAYLAND_PACKAGE="egl-wayland"
_STANDARD_PACKAGES="gparted nss-mdns chromium" _STANDARD_PACKAGES="gparted nss-mdns chromium"
_XORG="${_XORG_PACKAGE} ${_VNC_PACKAGE} ${_STANDARD_PACKAGES} ${_XFCE_PACKAGES} ${_GNOME_PACKAGES} ${_KDE_PACKAGES} egl-wayland plasma-wayland-session" _GRAPHICAL_PACKAGES="${_XORG_PACKAGE} ${_WAYLAND_PACKAGE} ${_VNC_PACKAGE} ${_STANDARD_PACKAGES} ${_XFCE_PACKAGES} ${_GNOME_PACKAGES} ${_KDE_PACKAGES}"
### check for root ### check for root
_root_check() { _root_check() {

8
usr/lib/archboot/container.sh
View file

@ -141,9 +141,9 @@ _install_archboot() {
echo "Adding "${_GPG_KEY_ID}" to trusted keys" echo "Adding "${_GPG_KEY_ID}" to trusted keys"
pacman-key --add "${_GPG_KEY}" >/dev/null 2>&1 pacman-key --add "${_GPG_KEY}" >/dev/null 2>&1
pacman-key --lsign-key "${_GPG_KEY_ID}" >/dev/null 2>&1 pacman-key --lsign-key "${_GPG_KEY_ID}" >/dev/null 2>&1
echo "Downloading ${_ARCHBOOT} ${_XORG} to ${1} ..." echo "Downloading ${_ARCHBOOT} ${_GRAPHICAL_PACKAGES} to ${1} ..."
#shellcheck disable=SC2086 #shellcheck disable=SC2086
pacman --root "${1}" -Syw --dbpath "${1}"/blankdb ${_ARCHBOOT} ${_XORG} --config "${_PACMAN_CONF}" --ignore systemd-resolvconf --cachedir "${_CACHEDIR}" --noconfirm >/dev/null 2>&1 pacman --root "${1}" -Syw --dbpath "${1}"/blankdb ${_ARCHBOOT} ${_GRAPHICAL_PACKAGES} --config "${_PACMAN_CONF}" --ignore systemd-resolvconf --cachedir "${_CACHEDIR}" --noconfirm >/dev/null 2>&1
echo "Installing ${_ARCHBOOT} to ${1} ..." echo "Installing ${_ARCHBOOT} to ${1} ..."
#shellcheck disable=SC2086 #shellcheck disable=SC2086
pacman --root "${1}" -Sy ${_ARCHBOOT} --config "${_PACMAN_CONF}" --ignore systemd-resolvconf --noconfirm --cachedir "${_CACHEDIR}" >/dev/null 2>&1 pacman --root "${1}" -Sy ${_ARCHBOOT} --config "${_PACMAN_CONF}" --ignore systemd-resolvconf --noconfirm --cachedir "${_CACHEDIR}" >/dev/null 2>&1
@ -172,9 +172,9 @@ _aarch64_install_archboot() {
systemd-nspawn -q -D "${1}" pacman-key --add "${_GPG_KEY}" >/dev/null 2>&1 systemd-nspawn -q -D "${1}" pacman-key --add "${_GPG_KEY}" >/dev/null 2>&1
systemd-nspawn -q -D "${1}" pacman-key --lsign-key "${_GPG_KEY_ID}" >/dev/null 2>&1 systemd-nspawn -q -D "${1}" pacman-key --lsign-key "${_GPG_KEY_ID}" >/dev/null 2>&1
rm "${1}"/"${_GPG_KEY}" rm "${1}"/"${_GPG_KEY}"
echo "Downloading ${_ARCHBOOT} ${_XORG} to ${1} ..." echo "Downloading ${_ARCHBOOT} ${_GRAPHICAL_PACKAGES} to ${1} ..."
[[ -d "${1}"/blankdb ]] || mkdir "${1}"/blankdb [[ -d "${1}"/blankdb ]] || mkdir "${1}"/blankdb
systemd-nspawn -q -D "${1}" /bin/bash -c "pacman -Syw --dbpath /blankdb ${_ARCHBOOT} ${_XORG} --config ${_PACMAN_CONF} --ignore systemd-resolvconf --noconfirm" >/dev/null 2>&1 systemd-nspawn -q -D "${1}" /bin/bash -c "pacman -Syw --dbpath /blankdb ${_ARCHBOOT} ${_GRAPHICAL_PACKAGES} --config ${_PACMAN_CONF} --ignore systemd-resolvconf --noconfirm" >/dev/null 2>&1
echo "Installing ${_ARCHBOOT} to ${1} ..." echo "Installing ${_ARCHBOOT} to ${1} ..."
systemd-nspawn -q -D "${1}" /bin/bash -c "pacman -Sy ${_ARCHBOOT} --config ${_PACMAN_CONF} --ignore systemd-resolvconf --noconfirm" >/dev/null 2>&1 systemd-nspawn -q -D "${1}" /bin/bash -c "pacman -Sy ${_ARCHBOOT} --config ${_PACMAN_CONF} --ignore systemd-resolvconf --noconfirm" >/dev/null 2>&1
} }

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

@ -5,7 +5,7 @@ _install_kde_wayland() {
if ! [[ -e /usr/bin/startplasma-x11 ]]; then if ! [[ -e /usr/bin/startplasma-x11 ]]; then
echo -e "\033[1mStep 3/5:\033[0m Installing KDE/Plasma Wayland now ..." echo -e "\033[1mStep 3/5:\033[0m Installing KDE/Plasma Wayland now ..."
echo " This will need some time ..." echo " This will need some time ..."
_prepare_graphic "${_WAYLAND_PACKAGE} ${_STANDARD_PACKAGES} plasma-wayland-session ${_KDE_PACKAGES}" >/dev/tty7 2>&1 _prepare_graphic "${_WAYLAND_PACKAGE} ${_STANDARD_PACKAGES} ${_KDE_PACKAGES}" >/dev/tty7 2>&1
echo -e "\033[1mStep 4/5:\033[0m Configuring KDE/Plasma Wayland ..." echo -e "\033[1mStep 4/5:\033[0m Configuring KDE/Plasma Wayland ..."
_configure_kde_wayland >/dev/tty7 2>&1 _configure_kde_wayland >/dev/tty7 2>&1
else else

8
usr/lib/archboot/repository.sh
View file

@ -19,12 +19,12 @@ _cachedir_check() {
} }
_download_packages() { _download_packages() {
echo "Downloading packages ${_PACKAGES} ${_ARCHBOOT} ${_XORG} to ${1} ..." echo "Downloading packages ${_PACKAGES} ${_ARCHBOOT} ${_GRAPHICAL_PACKAGES} to ${1} ..."
echo "Adding "${_GPG_KEY_ID}" to trusted keys" echo "Adding "${_GPG_KEY_ID}" to trusted keys"
pacman-key --add "${_GPG_KEY}" >/dev/null 2>&1 pacman-key --add "${_GPG_KEY}" >/dev/null 2>&1
pacman-key --lsign-key "${_GPG_KEY_ID}" >/dev/null 2>&1 pacman-key --lsign-key "${_GPG_KEY_ID}" >/dev/null 2>&1
#shellcheck disable=SC2086 #shellcheck disable=SC2086
pacman --root "${1}" -Syw ${_PACKAGES} ${_ARCHBOOT} ${_XORG} --ignore systemd-resolvconf --noconfirm --cachedir "${_CACHEDIR}" >/dev/null 2>&1 pacman --root "${1}" -Syw ${_PACKAGES} ${_ARCHBOOT} ${_GRAPHICAL_PACKAGES} --ignore systemd-resolvconf --noconfirm --cachedir "${_CACHEDIR}" >/dev/null 2>&1
} }
_aarch64_download_packages() { _aarch64_download_packages() {
@ -34,8 +34,8 @@ _aarch64_download_packages() {
cp "${_GPG_KEY}" "${1}"/"${_GPG_KEY}" cp "${_GPG_KEY}" "${1}"/"${_GPG_KEY}"
systemd-nspawn -q -D "${1}" pacman-key --add "${_GPG_KEY}" >/dev/null 2>&1 systemd-nspawn -q -D "${1}" pacman-key --add "${_GPG_KEY}" >/dev/null 2>&1
systemd-nspawn -q -D "${1}" pacman-key --lsign-key "${_GPG_KEY_ID}" >/dev/null 2>&1 systemd-nspawn -q -D "${1}" pacman-key --lsign-key "${_GPG_KEY_ID}" >/dev/null 2>&1
echo "Downloading packages ${_PACKAGES} ${_ARCHBOOT} ${_XORG} to ${1} ..." echo "Downloading packages ${_PACKAGES} ${_ARCHBOOT} ${_GRAPHICAL_PACKAGES} to ${1} ..."
systemd-nspawn -q -D "${1}" /bin/bash -c "pacman -Syw ${_PACKAGES} ${_ARCHBOOT} ${_XORG} --dbpath /blankdb --ignore systemd-resolvconf --noconfirm" >/dev/null 2>&1 systemd-nspawn -q -D "${1}" /bin/bash -c "pacman -Syw ${_PACKAGES} ${_ARCHBOOT} ${_GRAPHICAL_PACKAGES} --dbpath /blankdb --ignore systemd-resolvconf --noconfirm" >/dev/null 2>&1
} }
_move_packages() { _move_packages() {