diff --git a/PepDeb32/BldHelper-release.sh b/PepDeb32/BldHelper-release.sh index fe3f885..c3e97f6 100755 --- a/PepDeb32/BldHelper-release.sh +++ b/PepDeb32/BldHelper-release.sh @@ -30,12 +30,12 @@ _break=0 ; _wait=30 # Time (in seconds) to wait cd ${WorkingDir} # Run the build script - expect 50 minutes, allow 60. -./pepbld.sh 2>&1 | tee --append ${OutFile} + ./pepbld.sh 2>&1 | tee -a ${OutFile} # Timing matters, don't destroy the old one without a replacement. # Check for the ISO to appear and wait for things to settle. until [ -e fusato/*.iso ] - do ((++_break)) + do ((_break)) [ $_break -gt $_wait ] && break || sleep 1 done @@ -45,19 +45,17 @@ mv fusato/*.iso fusato/${FileName}.iso # Make the checksum file. cd fusato -echo "# ${FileName}" > ${FileName}-sha512.checksum +echo "# ${FileName} ${TODAY}" > ${FileName}-sha512.checksum sha512sum ${FileName}.iso >> ${FileName}-sha512.checksum ### # Remove the previous files in ${LOCATION} . -rm -f ${LOCATION}/${PREFIX}-${SUFFIX}*.iso -rm -f ${LOCATION}/${PREFIX}-${SUFFIX}*-sha512.checksum +rm -f ${LOCATION}/${FileName}*.iso +rm -f ${LOCATION}/${FileName}*-sha512.checksum #mv $(FileName}* ${LOCATION}/ mv ${FileName}.iso ${LOCATION}/${FileName}.iso mv ${FileName}-sha512.checksum ${LOCATION}/${FileName}-sha512.checksum - -# touch -t ${_stamp} ${LOCATION} ${LOCATION}/${FileName}* touch ${LOCATION}/${FileName}* lb clean & diff --git a/PepDeb64/BldHelper-release.sh b/PepDeb64/BldHelper-release.sh index dac9d86..23fadb7 100755 --- a/PepDeb64/BldHelper-release.sh +++ b/PepDeb64/BldHelper-release.sh @@ -30,12 +30,12 @@ _break=0 ; _wait=30 # Time (in seconds) to wait cd ${WorkingDir} # Run the build script - expect 50 minutes, allow 60. -./pepbld.sh 2>&1 | tee --append ${OutFile} + ./pepbld.sh 2>&1 | tee -a ${OutFile} # Timing matters, don't destroy the old one without a replacement. # Check for the ISO to appear and wait for things to settle. until [ -e fusato/*.iso ] - do ((++_break)) + do ((_break)) [ $_break -gt $_wait ] && break || sleep 1 done @@ -45,19 +45,17 @@ mv fusato/*.iso fusato/${FileName}.iso # Make the checksum file. cd fusato -echo "# ${FileName}" > ${FileName}-sha512.checksum +echo "# ${FileName} ${TODAY}" > ${FileName}-sha512.checksum sha512sum ${FileName}.iso >> ${FileName}-sha512.checksum ### # Remove the previous files in ${LOCATION} . -rm -f ${LOCATION}/${PREFIX}-${SUFFIX}*.iso -rm -f ${LOCATION}/${PREFIX}-${SUFFIX}*-sha512.checksum +rm -f ${LOCATION}/${FileName}*.iso +rm -f ${LOCATION}/${FileName}*-sha512.checksum #mv $(FileName}* ${LOCATION}/ mv ${FileName}.iso ${LOCATION}/${FileName}.iso mv ${FileName}-sha512.checksum ${LOCATION}/${FileName}-sha512.checksum - -# touch -t ${_stamp} ${LOCATION} ${LOCATION}/${FileName}* touch ${LOCATION}/${FileName}* lb clean & @@ -77,4 +75,4 @@ done else echo -e "\n\tAfter $_break seconds, ISO never appeared.\n" | tee --append ${OutFile} mv ${OutFile} ${LogFile} -fi +fi \ No newline at end of file diff --git a/PepDeb_arm64/BldHelper-release.sh b/PepDeb_arm64/BldHelper-release.sh index 502f011..8e53234 100755 --- a/PepDeb_arm64/BldHelper-release.sh +++ b/PepDeb_arm64/BldHelper-release.sh @@ -29,12 +29,12 @@ _break=0 ; _wait=30 # Time (in seconds) to wait cd ${WorkingDir} # Run the build script - expect 50 minutes, allow 60. -./pepbld.sh 2>&1 | tee --append ${OutFile} + ./pepbld.sh 2>&1 | tee -a ${OutFile} # Timing matters, don't destroy the old one without a replacement. # Check for the ISO to appear and wait for things to settle. until [ -e fusato/*.iso ] - do ((++_break)) + do ((_break)) [ $_break -gt $_wait ] && break || sleep 1 done @@ -44,19 +44,17 @@ mv fusato/*.iso fusato/${FileName}.iso # Make the checksum file. cd fusato -echo "# ${FileName}" > ${FileName}-sha512.checksum +echo "# ${FileName} ${TODAY}" > ${FileName}-sha512.checksum sha512sum ${FileName}.iso >> ${FileName}-sha512.checksum ### # Remove the previous files in ${LOCATION} . -rm -f ${LOCATION}/${PREFIX}-${SUFFIX}*.iso -rm -f ${LOCATION}/${PREFIX}-${SUFFIX}*-sha512.checksum +rm -f ${LOCATION}/${FileName}*.iso +rm -f ${LOCATION}/${FileName}*-sha512.checksum #mv $(FileName}* ${LOCATION}/ mv ${FileName}.iso ${LOCATION}/${FileName}.iso mv ${FileName}-sha512.checksum ${LOCATION}/${FileName}-sha512.checksum - -# touch -t ${_stamp} ${LOCATION} ${LOCATION}/${FileName}* touch ${LOCATION}/${FileName}* lb clean & @@ -76,4 +74,4 @@ done else echo -e "\n\tAfter $_break seconds, ISO never appeared.\n" | tee --append ${OutFile} mv ${OutFile} ${LogFile} -fi +fi \ No newline at end of file diff --git a/PepDev32/BldHelper-release.sh b/PepDev32/BldHelper-release.sh index 8b3c3d7..d81d4d6 100755 --- a/PepDev32/BldHelper-release.sh +++ b/PepDev32/BldHelper-release.sh @@ -29,12 +29,12 @@ _break=0 ; _wait=30 # Time (in seconds) to wait cd ${WorkingDir} # Run the build script - expect 50 minutes, allow 60. -./pepbld.sh 2>&1 | tee --append ${OutFile} + ./pepbld.sh 2>&1 | tee -a ${OutFile} # Timing matters, don't destroy the old one without a replacement. # Check for the ISO to appear and wait for things to settle. until [ -e fusato/*.iso ] - do ((++_break)) + do ((_break)) [ $_break -gt $_wait ] && break || sleep 1 done @@ -44,19 +44,17 @@ mv fusato/*.iso fusato/${FileName}.iso # Make the checksum file. cd fusato -echo "# ${FileName}" > ${FileName}-sha512.checksum +echo "# ${FileName} ${TODAY}" > ${FileName}-sha512.checksum sha512sum ${FileName}.iso >> ${FileName}-sha512.checksum ### # Remove the previous files in ${LOCATION} . -rm -f ${LOCATION}/${PREFIX}-${SUFFIX}*.iso -rm -f ${LOCATION}/${PREFIX}-${SUFFIX}*-sha512.checksum +rm -f ${LOCATION}/${FileName}*.iso +rm -f ${LOCATION}/${FileName}*-sha512.checksum #mv $(FileName}* ${LOCATION}/ mv ${FileName}.iso ${LOCATION}/${FileName}.iso mv ${FileName}-sha512.checksum ${LOCATION}/${FileName}-sha512.checksum - -# touch -t ${_stamp} ${LOCATION} ${LOCATION}/${FileName}* touch ${LOCATION}/${FileName}* lb clean & diff --git a/PepDev_arm64/BldHelper-release.sh b/PepDev_arm64/BldHelper-release.sh index f279151..5472d82 100755 --- a/PepDev_arm64/BldHelper-release.sh +++ b/PepDev_arm64/BldHelper-release.sh @@ -29,12 +29,12 @@ _break=0 ; _wait=30 # Time (in seconds) to wait cd ${WorkingDir} # Run the build script - expect 50 minutes, allow 60. -./pepbld.sh 2>&1 | tee --append ${OutFile} + ./pepbld.sh 2>&1 | tee -a ${OutFile} # Timing matters, don't destroy the old one without a replacement. # Check for the ISO to appear and wait for things to settle. until [ -e fusato/*.iso ] - do ((++_break)) + do ((_break)) [ $_break -gt $_wait ] && break || sleep 1 done @@ -44,19 +44,17 @@ mv fusato/*.iso fusato/${FileName}.iso # Make the checksum file. cd fusato -echo "# ${FileName}" > ${FileName}-sha512.checksum +echo "# ${FileName} ${TODAY}" > ${FileName}-sha512.checksum sha512sum ${FileName}.iso >> ${FileName}-sha512.checksum ### # Remove the previous files in ${LOCATION} . -rm -f ${LOCATION}/${PREFIX}-${SUFFIX}*.iso -rm -f ${LOCATION}/${PREFIX}-${SUFFIX}*-sha512.checksum +rm -f ${LOCATION}/${FileName}*.iso +rm -f ${LOCATION}/${FileName}*-sha512.checksum #mv $(FileName}* ${LOCATION}/ mv ${FileName}.iso ${LOCATION}/${FileName}.iso mv ${FileName}-sha512.checksum ${LOCATION}/${FileName}-sha512.checksum - -# touch -t ${_stamp} ${LOCATION} ${LOCATION}/${FileName}* touch ${LOCATION}/${FileName}* lb clean &