From 9439c07b28c64c03cb233cdde8c404a56096df67 Mon Sep 17 00:00:00 2001 From: oddlama Date: Sat, 25 Apr 2020 15:24:24 +0200 Subject: [PATCH] make ADDITIONAL_PACKAGES an bash array --- scripts/config.sh | 9 +++++---- scripts/main.sh | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/scripts/config.sh b/scripts/config.sh index 758c662..b2dde8a 100644 --- a/scripts/config.sh +++ b/scripts/config.sh @@ -38,8 +38,9 @@ create_default_disk_layout swap=8GiB /dev/sdX # but create two raid0s for all swap partitions and all root partitions # respectively. Create luks on the root raid. # Hint: You will get N times the swap amount, so be sure to divide beforehand. -#create_raid0_luks_layout swap=4GiB /dev/sd{X,Y} -#create_raid0_luks_layout swap=0 type=bios /dev/sd{X,Y} +#create_raid0_luks_layout swap=4GiB /dev/sd{X,Y} # EFI +#create_raid0_luks_layout swap=4GiB type=bios /dev/sd{X,Y} # BIOS +#create_raid0_luks_layout swap=0 type=bios /dev/sd{X,Y} # BIOS no swap ################################################ # System configuration @@ -91,8 +92,8 @@ STAGE3_BASENAME="stage3-$GENTOO_ARCH-hardened+nomultilib" ################################################ # Additional (optional) configuration -# List of additional packages to install (will be directly passed to emerge) -ADDITIONAL_PACKAGES="app-editors/neovim" +# Array of additional packages to install +ADDITIONAL_PACKAGES=("app-editors/neovim") # Install and enable dhcpcd INSTALL_DHCPCD=true # Install and configure sshd (a reasonably secure config is provided, which diff --git a/scripts/main.sh b/scripts/main.sh index bff9949..2a8c9df 100755 --- a/scripts/main.sh +++ b/scripts/main.sh @@ -329,10 +329,10 @@ main_install_gentoo_in_chroot() { fi # Install additional packages, if any. - if [[ -n $ADDITIONAL_PACKAGES ]]; then + if [[ ${#ADDITIONAL_PACKAGES[@]} -gt 0 ]]; then einfo "Installing additional packages" # shellcheck disable=SC2086 - try emerge --verbose --autounmask-continue=y -- $ADDITIONAL_PACKAGES + try emerge --verbose --autounmask-continue=y -- "${ADDITIONAL_PACKAGES[@]}" fi if ask "Do you want to assign a root password now?"; then