update build script

This commit is contained in:
Manuel 2023-05-12 11:26:06 +00:00
parent fee748dfde
commit c0b27cfe4b
2 changed files with 31 additions and 29 deletions

View File

@ -1,12 +1,12 @@
#!/bin/bash #!/bin/bash
# SPDX-License-Identifier: GPL-3.0-or-later ################################################################################
# # Title: Bldhelper.sh
# SPDX-FileCopyrightText: 2023 PeppemrintOS Team (peppermintosteam@proton.me) # Description: Script para construir a imagem ISO do PeppermintOS
# Author: PeppermintOS Team <peppermintosteam@proton.me>
# BldHelper-release.sh # Date: May 10, 2023
# This script is meant to be run on the build server and expects to find and update itself from adjacent repos. # License: GPL-3.0-or-later
# From PepDistroConfigs, these repos are ../PepProPixMaps & ../PepProTools and are vital to having a working build. ################################################################################
### ## # Set build working variables HERE # ## ### ### ## # Set build working variables HERE # ## ###
@ -29,9 +29,9 @@ _cache="./cache"
_break=0 ; _wait=30 # Time (in seconds) to wait _break=0 ; _wait=30 # Time (in seconds) to wait
cd ${WorkingDir} cd ${WorkingDir}
# Run the build script.
./pepbld.sh 2>&1 | tee -a ${OutFile}
# Run the build script - expect 50 minutes, allow 60.
./pepbld.sh 2>&1 | tee --append ${OutFile}
# Timing matters, don't destroy the old one without a replacement. # Timing matters, don't destroy the old one without a replacement.
# Check for the ISO to appear and wait for things to settle. # Check for the ISO to appear and wait for things to settle.
@ -46,14 +46,13 @@ mv fusato/*.iso fusato/${FileName}.iso
# Make the checksum file. # Make the checksum file.
cd fusato cd fusato
echo "# ${FileName} ${TODAY}" > ${FileName}-sha512.checksum echo "# ${FileName}" > ${FileName}-sha512.checksum
sha512sum ${FileName}.iso >> ${FileName}-sha512.checksum sha512sum ${FileName}.iso >> ${FileName}-sha512.checksum
### <HouseKeeping> ### <HouseKeeping>
# Remove the previous files in ${LOCATION} . # Remove the previous files in ${LOCATION} .
rm -f ${LOCATION}/${FileName}*.iso rm -f ${LOCATION}/${PREFIX}-${SUFFIX}*.iso
rm -f ${LOCATION}/${FileName}*-sha512.checksum rm -f ${LOCATION}/${PREFIX}-${SUFFIX}*-sha512.checksum
#rm -f ${LOCATION}/${FileName}*.torrent
#mv $(FileName}* ${LOCATION}/ #mv $(FileName}* ${LOCATION}/
mv ${FileName}.iso ${LOCATION}/${FileName}.iso mv ${FileName}.iso ${LOCATION}/${FileName}.iso
@ -62,8 +61,7 @@ mv ${FileName}-sha512.checksum ${LOCATION}/${FileName}-sha512.checksum
# touch -t ${_stamp} ${LOCATION} ${LOCATION}/${FileName}* # touch -t ${_stamp} ${LOCATION} ${LOCATION}/${FileName}*
touch ${LOCATION}/${FileName}* touch ${LOCATION}/${FileName}*
# Clean the fusato folder lb clean &
lb clean &
# Move the log file to the log directory. # Move the log file to the log directory.
[ ! -e ${LogDir} ] && mkdir -p ${LogDir} [ ! -e ${LogDir} ] && mkdir -p ${LogDir}
@ -82,3 +80,6 @@ else echo -e "\n\tAfter $_break seconds, ISO never appeared.\n" | tee --append $
mv ${OutFile} ${LogFile} mv ${OutFile} ${LogFile}
fi fi
# Remove the fusato folder
#rm -rf fusato

View File

@ -1,12 +1,12 @@
#!/bin/bash #!/bin/bash
# SPDX-License-Identifier: GPL-3.0-or-later ################################################################################
# # Title: Bldhelper.sh
# SPDX-FileCopyrightText: 2023 PeppemrintOS Team (peppermintosteam@proton.me) # Description: Script para construir a imagem ISO do PeppermintOS
# Author: PeppermintOS Team <peppermintosteam@proton.me>
# BldHelper-release.sh # Date: May 10, 2023
# This script is meant to be run on the build server and expects to find and update itself from adjacent repos. # License: GPL-3.0-or-later
# From PepDistroConfigs, these repos are ../PepProPixMaps & ../PepProTools and are vital to having a working build. ################################################################################
### ## # Set build working variables HERE # ## ### ### ## # Set build working variables HERE # ## ###
@ -29,9 +29,8 @@ _cache="./cache"
_break=0 ; _wait=30 # Time (in seconds) to wait _break=0 ; _wait=30 # Time (in seconds) to wait
cd ${WorkingDir} cd ${WorkingDir}
# Run the build script. # Run the build script - expect 50 minutes, allow 60.
./pepbld.sh 2>&1 | tee -a ${OutFile} ./pepbld.sh 2>&1 | tee --append ${OutFile}
# Timing matters, don't destroy the old one without a replacement. # Timing matters, don't destroy the old one without a replacement.
# Check for the ISO to appear and wait for things to settle. # Check for the ISO to appear and wait for things to settle.
@ -46,14 +45,13 @@ mv fusato/*.iso fusato/${FileName}.iso
# Make the checksum file. # Make the checksum file.
cd fusato cd fusato
echo "# ${FileName} ${TODAY}" > ${FileName}-sha512.checksum echo "# ${FileName}" > ${FileName}-sha512.checksum
sha512sum ${FileName}.iso >> ${FileName}-sha512.checksum sha512sum ${FileName}.iso >> ${FileName}-sha512.checksum
### <HouseKeeping> ### <HouseKeeping>
# Remove the previous files in ${LOCATION} . # Remove the previous files in ${LOCATION} .
rm -f ${LOCATION}/${FileName}*.iso rm -f ${LOCATION}/${PREFIX}-${SUFFIX}*.iso
rm -f ${LOCATION}/${FileName}*-sha512.checksum rm -f ${LOCATION}/${PREFIX}-${SUFFIX}*-sha512.checksum
#rm -f ${LOCATION}/${FileName}*.torrent
#mv $(FileName}* ${LOCATION}/ #mv $(FileName}* ${LOCATION}/
mv ${FileName}.iso ${LOCATION}/${FileName}.iso mv ${FileName}.iso ${LOCATION}/${FileName}.iso
@ -81,3 +79,6 @@ else echo -e "\n\tAfter $_break seconds, ISO never appeared.\n" | tee --append $
mv ${OutFile} ${LogFile} mv ${OutFile} ${LogFile}
fi fi
# Remove the fusato folder
#rm -rf fusato