From 15bb611ee8b2298c5c2fcb654b65202062367456 Mon Sep 17 00:00:00 2001 From: Dennis ten Hoove Date: Thu, 2 May 2024 08:23:16 +0200 Subject: [PATCH] Code cleanup --- arkdep-build | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arkdep-build b/arkdep-build index 1cd5b0c..de9fa12 100755 --- a/arkdep-build +++ b/arkdep-build @@ -156,8 +156,6 @@ if [[ $type == 'archlinux' ]]; then btrfs subvolume create $workdir/etc || cleanup_and_quit "Failed to create btrfs subvolume $workdir/etc)" btrfs subvolume create $workdir/var || cleanup_and_quit "Failed to create btrfs subvolume $workdir/var)" - printf "\e[1;34m-->\e[0m\e[1m Mounting $build_image at $workdir\e[0m\n" - # Read base package list and install base system readarray bootstrap_packages < $variantdir/bootstrap.list printf '\e[1;34m-->\e[0m\e[1m Installing base packages\e[0m\n' @@ -166,7 +164,7 @@ if [[ $type == 'archlinux' ]]; then pacstrap -c -C $variantdir/pacman.conf $workdir ${bootstrap_packages[*]} || cleanup_and_quit 'Failed to install secondary package list' cp -v $variantdir/pacman.conf $workdir/etc/pacman.conf else - pacstrap -c $workdir ${bootstrap_packages[*]} || cleanup_and_quit 'Failed to install secondary package list' + pacstrap -c $workdir ${bootstrap_packages[*]} || cleanup_and_quit 'Failed to bootstrap system' fi # If overlay directory exists in variant copy it's contents to the temporary subvolume @@ -190,7 +188,7 @@ if [[ $type == 'archlinux' ]]; then # Read package list and install readarray packages < $variantdir/package.list - arch-chroot $workdir pacman -S --noconfirm ${packages[*]} || cleanup_and_quit 'Failed to install base packages' + arch-chroot $workdir pacman -S --noconfirm ${packages[*]} || cleanup_and_quit 'Failed to install packages' # Unmount pacman cache umount -l $workdir/var/cache/pacman/pkg