diff --git a/my-distro-devuan-32-pae/BldHelper.sh b/my-distro-devuan-32-pae/BldHelper.sh index 91bf2de2..21b20a4d 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-configs-devuan/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 64c5cea4..111df96a 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-configs-devuan/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,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-devuan-64/BldHelper.sh b/my-distro-devuan-64/BldHelper.sh index f53638ce..3cac4cc6 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-configs-devuan/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