From 707e0c7fcb84b56f276a07771b7c7d0b36d670df Mon Sep 17 00:00:00 2001 From: manuel Date: Fri, 10 Nov 2023 21:17:58 -0100 Subject: [PATCH] atualizar os scripts BldHelper --- my-distro-debian-32-pae/BldHelper.sh | 8 ++++---- my-distro-debian-32/BldHelper.sh | 7 ++++--- my-distro-debian-64/BldHelper.sh | 7 ++++--- my-distro-devuan-32-pae/BldHelper.sh | 7 ++++--- my-distro-devuan-32/BldHelper.sh | 7 ++++--- my-distro-devuan-64/BldHelper.sh | 7 ++++--- 6 files changed, 24 insertions(+), 19 deletions(-) diff --git a/my-distro-debian-32-pae/BldHelper.sh b/my-distro-debian-32-pae/BldHelper.sh index 1046ad49..5a1f4a01 100755 --- a/my-distro-debian-32-pae/BldHelper.sh +++ b/my-distro-debian-32-pae/BldHelper.sh @@ -19,7 +19,7 @@ WorkingDir="/home/$SUDO_USER/My-distro-DI-configs/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 @@ -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-32/BldHelper.sh b/my-distro-debian-32/BldHelper.sh index e5dcd3ec..1b2e7d1b 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-DI-configs/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,8 +38,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-64/BldHelper.sh b/my-distro-debian-64/BldHelper.sh index c93c6e50..214c8725 100755 --- a/my-distro-debian-64/BldHelper.sh +++ b/my-distro-debian-64/BldHelper.sh @@ -19,7 +19,7 @@ WorkingDir=/"home/$SUDO_USER/My-distro-DI-configs/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 @@ -38,8 +38,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-devuan-32-pae/BldHelper.sh b/my-distro-devuan-32-pae/BldHelper.sh index bbe93020..eb26049c 100755 --- a/my-distro-devuan-32-pae/BldHelper.sh +++ b/my-distro-devuan-32-pae/BldHelper.sh @@ -19,7 +19,7 @@ WorkingDir="/home/$SUDO_USER/My-distro-DI-configs/my-distro-devuan-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 @@ -38,8 +38,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-devuan-32/BldHelper.sh b/my-distro-devuan-32/BldHelper.sh index 77f247b4..a14d6fc9 100755 --- a/my-distro-devuan-32/BldHelper.sh +++ b/my-distro-devuan-32/BldHelper.sh @@ -19,7 +19,7 @@ WorkingDir="/home/$SUDO_USER/My-distro-DI-configs/my-distro-devuan-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,8 +38,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-devuan-64/BldHelper.sh b/my-distro-devuan-64/BldHelper.sh index 04ad46a8..2c6be7d8 100755 --- a/my-distro-devuan-64/BldHelper.sh +++ b/my-distro-devuan-64/BldHelper.sh @@ -19,7 +19,7 @@ WorkingDir="/home/$SUDO_USER/My-distro-DI-configs/my-distro-devuan-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 @@ -38,8 +38,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