From d1d05328e617710dfc6dd61cb8573a4c17ca20d9 Mon Sep 17 00:00:00 2001 From: manuel Date: Fri, 10 Nov 2023 21:16:57 -0100 Subject: [PATCH] atualizar os scripts BldHelper --- my-distro-debian-32-pae/BldHelper.sh | 7 ++++--- my-distro-debian-32/BldHelper.sh | 8 ++++---- my-distro-debian-64/BldHelper.sh | 8 ++++---- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/my-distro-debian-32-pae/BldHelper.sh b/my-distro-debian-32-pae/BldHelper.sh index 9565120b..5db643e4 100755 --- a/my-distro-debian-32-pae/BldHelper.sh +++ b/my-distro-debian-32-pae/BldHelper.sh @@ -20,7 +20,7 @@ WorkingDir="/home/$SUDO_USER/My-distro-configs-debian/my-distro-debian-32-pae" # Execute the ISO building script cd ${WorkingDir} -./build.sh +./build.sh 2>&1 | tee /tmp/build_log.txt # Move and rename the ISO file cd build @@ -39,8 +39,9 @@ mv ${FileName}-${TODAY}.iso ${LOCATION} mv ${FileName}-${TODAY}-sha512.checksum ${LOCATION} # Move the log file to the log directory (if it exists) -if [ -f /tmp/${PREFIX}${SUFFIX}.out ]; then - mv /tmp/${PREFIX}${SUFFIX}.out ${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log +if [ -f /tmp/build_log.txt ]; then + LogFileName="${PREFIX}-${SUFFIX}-${BUILD}.log" + mv /tmp/build_log.txt ${LogDir}/${LogFileName} fi # Clean the build folder diff --git a/my-distro-debian-32/BldHelper.sh b/my-distro-debian-32/BldHelper.sh index 2027c3f2..b7284368 100755 --- a/my-distro-debian-32/BldHelper.sh +++ b/my-distro-debian-32/BldHelper.sh @@ -19,7 +19,7 @@ WorkingDir="/home/$SUDO_USER/My-distro-configs-debian/my-distro-debian-32" # Execute the ISO building script cd ${WorkingDir} -./build.sh +./build.sh 2>&1 | tee /tmp/build_log.txt # Move and rename the ISO file cd build @@ -38,10 +38,10 @@ mv ${FileName}-${TODAY}.iso ${LOCATION} mv ${FileName}-${TODAY}-sha512.checksum ${LOCATION} # Move the log file to the log directory (if it exists) -if [ -f /tmp/${PREFIX}${SUFFIX}.out ]; then - mv /tmp/${PREFIX}${SUFFIX}.out ${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log +if [ -f /tmp/build_log.txt ]; then + LogFileName="${PREFIX}-${SUFFIX}-${BUILD}.log" + mv /tmp/build_log.txt ${LogDir}/${LogFileName} fi - # Clean the build folder lb clean diff --git a/my-distro-debian-64/BldHelper.sh b/my-distro-debian-64/BldHelper.sh index d526c465..581cf406 100755 --- a/my-distro-debian-64/BldHelper.sh +++ b/my-distro-debian-64/BldHelper.sh @@ -20,7 +20,7 @@ WorkingDir="/home/$SUDO_USER/My-distro-configs-debian/my-distro-debian-64" # Execute the ISO building script cd ${WorkingDir} -./build.sh +./build.sh 2>&1 | tee /tmp/build_log.txt # Move and rename the ISO file cd build @@ -39,10 +39,10 @@ mv ${FileName}-${TODAY}.iso ${LOCATION} mv ${FileName}-${TODAY}-sha512.checksum ${LOCATION} # Move the log file to the log directory (if it exists) -if [ -f /tmp/${PREFIX}${SUFFIX}.out ]; then - mv /tmp/${PREFIX}${SUFFIX}.out ${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log +if [ -f /tmp/build_log.txt ]; then + LogFileName="${PREFIX}-${SUFFIX}-${BUILD}.log" + mv /tmp/build_log.txt ${LogDir}/${LogFileName} fi - # Clean the build folder lb clean