From 5bdd0c456621b06287525455ea0a333dd3c48964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= Date: Tue, 18 May 2021 16:20:53 +0200 Subject: [PATCH] Revert "Log all commands" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit d2b4645fb45f3660f4bf84d1b4b7926f10b207c7. Initial commit said “run_and_log doesn't like redirects, but I don't think thats an issue” but it is a real issue when the whole point of the command is to modify/overwrite a file with a redirection. Keep only run_and_log for the final file moves. --- build.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/build.sh b/build.sh index 45b710c..4772cde 100755 --- a/build.sh +++ b/build.sh @@ -325,28 +325,29 @@ case "$IMAGE_TYPE" in debug "Stage 1/2 - File(s)" # Setup custom debian-cd to make our changes - run_and_log cp -aT /usr/share/debian-cd simple-cdd/debian-cd + cp -aT /usr/share/debian-cd simple-cdd/debian-cd [ $? -eq 0 ] || failure # Keep 686-pae udebs as we changed the default from 686 # to 686-pae in the debian-installer images - run_and_log sed -i -e '/686-pae/d' \ + sed -i -e '/686-pae/d' \ simple-cdd/debian-cd/data/$CODENAME/exclude-udebs-i386 [ $? -eq 0 ] || failure # Configure the kali profile with the packages we want - run_and_log grep -v '^#' kali-config/installer-$KALI_VARIANT/packages \ + grep -v '^#' kali-config/installer-$KALI_VARIANT/packages \ > simple-cdd/profiles/kali.downloads [ $? -eq 0 ] || failure # Tasksel is required in the mirror for debian-cd - run_and_log echo "tasksel" >> simple-cdd/profiles/kali.downloads + echo tasksel >> simple-cdd/profiles/kali.downloads [ $? -eq 0 ] || failure # Grub is the only supported bootloader on arm64 # so ensure it's on the iso for arm64. if [ "$KALI_ARCH" = "arm64" ]; then - run_and_log echo "grub-efi-arm64" >> simple-cdd/profiles/kali.downloads + debug "arm64 GRUB" + echo "grub-efi-arm64" >> simple-cdd/profiles/kali.downloads [ $? -eq 0 ] || failure fi