update peptools and build scripts

This commit is contained in:
Manuel 2023-05-12 11:17:22 +00:00
parent 1b3e5c9179
commit d610075133
6 changed files with 141 additions and 104 deletions

View File

@ -1,8 +1,12 @@
#!/bin/bash #!/bin/bash
# BldHelper-release.sh ################################################################################
# This script is meant to be run on the build server and expects to find and update itself from adjacent repos. # Title: Bldhelper.sh
# From PepDistroConfigs, these repos are ../PepProPixMaps & ../PepProTools and are vital to having a working build. # Description: Script para construir a imagem ISO do PeppermintOS
# Author: PeppermintOS Team <peppermintosteam@proton.me>
# Date: May 10, 2023
# License: GPL-3.0-or-later
################################################################################
### ## # Set build working variables HERE # ## ### ### ## # Set build working variables HERE # ## ###
@ -25,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.
@ -42,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
@ -58,15 +60,22 @@ 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}
mv ${OutFile} ${LogFile} mv ${OutFile} ${LogFile}
# Remove old packages from the cache directory
for i in $(grep "Del " ${LogFile} | sort -u | cut -f2,3 -d" " | tr " " "_" | tr ":" "*" | tr "+" "*" )
do for j in $_cache/packages.*/${i}*.deb
do [ -e $j ] && rm $j
done
done
### </HouseKeeping> ### </HouseKeeping>
else echo -e "\n\tAfter $_break seconds, ISO never appeared.\n" | tee --append ${OutFile} else echo -e "\n\tAfter $_break seconds, ISO never appeared.\n" | tee --append ${OutFile}
mv ${OutFile} ${LogFile} mv ${OutFile} ${LogFile}
fi fi

View File

@ -1,8 +1,12 @@
#!/bin/bash #!/bin/bash
# BldHelper-release.sh ################################################################################
# This script is meant to be run on the build server and expects to find and update itself from adjacent repos. # Title: Bldhelper.sh
# From PepDistroConfigs, these repos are ../PepProPixMaps & ../PepProTools and are vital to having a working build. # Description: Script para construir a imagem ISO do PeppermintOS
# Author: PeppermintOS Team <peppermintosteam@proton.me>
# Date: May 10, 2023
# License: GPL-3.0-or-later
################################################################################
### ## # Set build working variables HERE # ## ### ### ## # Set build working variables HERE # ## ###
@ -25,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.
@ -42,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
@ -58,13 +60,19 @@ 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}
mv ${OutFile} ${LogFile} mv ${OutFile} ${LogFile}
# Remove old packages from the cache directory
for i in $(grep "Del " ${LogFile} | sort -u | cut -f2,3 -d" " | tr " " "_" | tr ":" "*" | tr "+" "*" )
do for j in $_cache/packages.*/${i}*.deb
do [ -e $j ] && rm $j
done
done
### </HouseKeeping> ### </HouseKeeping>
else echo -e "\n\tAfter $_break seconds, ISO never appeared.\n" | tee --append ${OutFile} else echo -e "\n\tAfter $_break seconds, ISO never appeared.\n" | tee --append ${OutFile}

View File

@ -1,9 +1,12 @@
#!/bin/bash #!/bin/bash
# BldHelper-release.sh ################################################################################
# This script is meant to be run on the build server and expects to find and update itself from adjacent repos. # Title: Bldhelper.sh
# From PepDistroConfigs, these repos are ../PepProPixMaps & ../PepProTools and are vital to having a working build. # Description: Script para construir a imagem ISO do PeppermintOS
# Author: PeppermintOS Team <peppermintosteam@proton.me>
# Date: May 10, 2023
# License: GPL-3.0-or-later
################################################################################
### ## # Set build working variables HERE # ## ### ### ## # Set build working variables HERE # ## ###
PREFIX=PepMini # Sets a unique final name of the ISO and checksum so <HouseKeeping> only removes 2 files . PREFIX=PepMini # Sets a unique final name of the ISO and checksum so <HouseKeeping> only removes 2 files .
@ -25,9 +28,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.
@ -42,14 +44,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
@ -58,13 +59,19 @@ 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}
mv ${OutFile} ${LogFile} mv ${OutFile} ${LogFile}
# Remove old packages from the cache directory
for i in $(grep "Del " ${LogFile} | sort -u | cut -f2,3 -d" " | tr " " "_" | tr ":" "*" | tr "+" "*" )
do for j in $_cache/packages.*/${i}*.deb
do [ -e $j ] && rm $j
done
done
### </HouseKeeping> ### </HouseKeeping>
else echo -e "\n\tAfter $_break seconds, ISO never appeared.\n" | tee --append ${OutFile} else echo -e "\n\tAfter $_break seconds, ISO never appeared.\n" | tee --append ${OutFile}

View File

@ -1,9 +1,12 @@
#!/bin/bash #!/bin/bash
# BldHelper-release.sh ################################################################################
# This script is meant to be run on the build server and expects to find and update itself from adjacent repos. # Title: Bldhelper.sh
# From PepDistroConfigs, these repos are ../PepProPixMaps & ../PepProTools and are vital to having a working build. # Description: Script para construir a imagem ISO do PeppermintOS
# Author: PeppermintOS Team <peppermintosteam@proton.me>
# Date: May 10, 2023
# License: GPL-3.0-or-later
################################################################################
### ## # Set build working variables HERE # ## ### ### ## # Set build working variables HERE # ## ###
PREFIX=PepMini # Sets a unique final name of the ISO and checksum so <HouseKeeping> only removes 2 files . PREFIX=PepMini # Sets a unique final name of the ISO and checksum so <HouseKeeping> only removes 2 files .
@ -25,56 +28,52 @@ _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.
until [ -e fusato/*.iso ] until [ -e fusato/*.iso ]
do do ((++_break))
((++_break)) [ $_break -gt $_wait ] && break || sleep 1
if [ $_break -gt $_wait ]
then
echo "Timeout waiting for ISO to appear"
break
fi
sleep 1
done done
if [ ${_break} -lt ${_wait} ] ; then if [ ${_break} -lt ${_wait} ] ; then
mv fusato/*.iso fusato/${FileName}.iso 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
mv ${FileName}-sha512.checksum ${LOCATION}/${FileName}-sha512.checksum 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}*
# Move the log file to the log directory. lb clean &
[ ! -e ${LogDir} ] && mkdir -p ${LogDir}
mv ${OutFile} ${LogFile}
### </HouseKeeping> # Move the log file to the log directory.
[ ! -e ${LogDir} ] && mkdir -p ${LogDir}
mv ${OutFile} ${LogFile}
else # Remove old packages from the cache directory
echo -e "\n\tAfter $_break seconds, ISO never appeared.\n" | tee --append ${OutFile} for i in $(grep "Del " ${LogFile} | sort -u | cut -f2,3 -d" " | tr " " "_" | tr ":" "*" | tr "+" "*" )
mv ${OutFile} ${LogFile} do for j in $_cache/packages.*/${i}*.deb
do [ -e $j ] && rm $j
done
done
### </HouseKeeping>
else echo -e "\n\tAfter $_break seconds, ISO never appeared.\n" | tee --append ${OutFile}
mv ${OutFile} ${LogFile}
fi fi
rm -r *
exit 0

View File

@ -1,9 +1,12 @@
#!/bin/bash #!/bin/bash
# BldHelper-release.sh ################################################################################
# This script is meant to be run on the build server and expects to find and update itself from adjacent repos. # Title: Bldhelper.sh
# From PepDistroConfigs, these repos are ../PepProPixMaps & ../PepProTools and are vital to having a working build. # Description: Script para construir a imagem ISO do PeppermintOS
# Author: PeppermintOS Team <peppermintosteam@proton.me>
# Date: May 10, 2023
# License: GPL-3.0-or-later
################################################################################
### ## # Set build working variables HERE # ## ### ### ## # Set build working variables HERE # ## ###
PREFIX=PepMini # Sets a unique final name of the ISO and checksum so <HouseKeeping> only removes 2 files . PREFIX=PepMini # Sets a unique final name of the ISO and checksum so <HouseKeeping> only removes 2 files .
@ -25,9 +28,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.
@ -42,14 +44,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
@ -58,13 +59,19 @@ 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}
mv ${OutFile} ${LogFile} mv ${OutFile} ${LogFile}
# Remove old packages from the cache directory
for i in $(grep "Del " ${LogFile} | sort -u | cut -f2,3 -d" " | tr " " "_" | tr ":" "*" | tr "+" "*" )
do for j in $_cache/packages.*/${i}*.deb
do [ -e $j ] && rm $j
done
done
### </HouseKeeping> ### </HouseKeeping>
else echo -e "\n\tAfter $_break seconds, ISO never appeared.\n" | tee --append ${OutFile} else echo -e "\n\tAfter $_break seconds, ISO never appeared.\n" | tee --append ${OutFile}

View File

@ -1,9 +1,12 @@
#!/bin/bash #!/bin/bash
# BldHelper-release.sh ################################################################################
# This script is meant to be run on the build server and expects to find and update itself from adjacent repos. # Title: Bldhelper.sh
# From PepDistroConfigs, these repos are ../PepProPixMaps & ../PepProTools and are vital to having a working build. # Description: Script para construir a imagem ISO do PeppermintOS
# Author: PeppermintOS Team <peppermintosteam@proton.me>
# Date: May 10, 2023
# License: GPL-3.0-or-later
################################################################################
### ## # Set build working variables HERE # ## ### ### ## # Set build working variables HERE # ## ###
PREFIX=PepMini # Sets a unique final name of the ISO and checksum so <HouseKeeping> only removes 2 files . PREFIX=PepMini # Sets a unique final name of the ISO and checksum so <HouseKeeping> only removes 2 files .
@ -25,9 +28,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.
@ -42,14 +44,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
@ -58,15 +59,21 @@ 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}
mv ${OutFile} ${LogFile} mv ${OutFile} ${LogFile}
# Remove old packages from the cache directory
for i in $(grep "Del " ${LogFile} | sort -u | cut -f2,3 -d" " | tr " " "_" | tr ":" "*" | tr "+" "*" )
do for j in $_cache/packages.*/${i}*.deb
do [ -e $j ] && rm $j
done
done
### </HouseKeeping> ### </HouseKeeping>
else echo -e "\n\tAfter $_break seconds, ISO never appeared.\n" | tee --append ${OutFile} else echo -e "\n\tAfter $_break seconds, ISO never appeared.\n" | tee --append ${OutFile}
mv ${OutFile} ${LogFile} mv ${OutFile} ${LogFile}
fi fi