From e7b607240597e437ad3ebe3c2236af708c99f6cb Mon Sep 17 00:00:00 2001 From: Manuel Date: Tue, 28 Mar 2023 13:28:50 +0000 Subject: [PATCH] new commit --- PepDeb32/BldHelper-release.sh | 6 ++++-- PepDeb64/BldHelper-release.sh | 6 ++++-- PepDeb_arm64/BldHelper-release.sh | 5 +++-- PepDev32/BldHelper-release.sh | 6 ++++-- PepDev64/BldHelper-release.sh | 5 +++-- PepDev_arm64/BldHelper-release.sh | 6 ++++-- buildall.sh | 3 +++ 7 files changed, 25 insertions(+), 12 deletions(-) diff --git a/PepDeb32/BldHelper-release.sh b/PepDeb32/BldHelper-release.sh index 4a923f3..3764511 100755 --- a/PepDeb32/BldHelper-release.sh +++ b/PepDeb32/BldHelper-release.sh @@ -8,7 +8,7 @@ PREFIX=PepMini # Sets a unique final name of the ISO and checksum so only removes 2 files . SUFFIX=i386 # Also used by . And to distinguish between amd64 and x86 or devuan and ubuntu . -BUILD=PepMini # Sets which pepbld.sh to use and the location in /var/www/html/[release|rc|testing|nightly|unstable] +BUILD=release # Sets which pepbld.sh to use and the location in /var/www/html/[release|rc|testing|nightly|unstable] ################################################## ### ## # Make NO Edits Below This Line !! # ## ### @@ -16,7 +16,7 @@ BUILD=PepMini # Sets which pepbld.sh to use and the location in /var/www/html/[ TODAY=$(date -u +"%Y-%m-%d") && export TODAY # If MasterBuilder.sh is used IT will set the date. If not used, we set it here. FileName="${PREFIX}-${SUFFIX}" # This will give a uniquely named and dated ISO and checksum for . -LOCATION=/var/www/html/nightly/${BUILD} # Tells and the script which 2 files to remove and where to put them. +LOCATION=/var/www/html/${BUILD} # Tells and the script which 2 files to remove and where to put them. LogDir=/var/log/Live-Build # This folder contains a log for the last $[PREFIX]-$[SUFFIX] build. WorkingDir=~/pepadmin/PepMini/PepDeb32 #* If we change servers or locations T*H*I*S line is the O*N*L*Y line to change. * OutFile="/tmp/${PREFIX}${SUFFIX}.out" @@ -24,6 +24,8 @@ LogFile="${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log" _cache="./cache" _break=0 ; _wait=30 # Time (in seconds) to wait +cd ${WorkingDir} + # Run the build script. ./pepbld.sh 2>&1 | tee -a ${OutFile} diff --git a/PepDeb64/BldHelper-release.sh b/PepDeb64/BldHelper-release.sh index 2d0d09b..785b66f 100755 --- a/PepDeb64/BldHelper-release.sh +++ b/PepDeb64/BldHelper-release.sh @@ -8,7 +8,7 @@ PREFIX=PepMini # Sets a unique final name of the ISO and checksum so only removes 2 files . SUFFIX=amd64 # Also used by . And to distinguish between amd64 and x86 or devuan and ubuntu . -BUILD=PepMini # Sets which pepbld.sh to use and the location in /var/www/html/[release|rc|testing|nightly|unstable] +BUILD=release # Sets which pepbld.sh to use and the location in /var/www/html/[release|rc|testing|nightly|unstable] ################################################## ### ## # Make NO Edits Below This Line !! # ## ### @@ -16,7 +16,7 @@ BUILD=PepMini # Sets which pepbld.sh to use and the location in /var/www/html/[ TODAY=$(date -u +"%Y-%m-%d") && export TODAY # If MasterBuilder.sh is used IT will set the date. If not used, we set it here. FileName="${PREFIX}-${SUFFIX}" # This will give a uniquely named and dated ISO and checksum for . -LOCATION=/var/www/html/nightly/${BUILD} # Tells and the script which 2 files to remove and where to put them. +LOCATION=/var/www/html/${BUILD} # Tells and the script which 2 files to remove and where to put them. LogDir=/var/log/Live-Build # This folder contains a log for the last $[PREFIX]-$[SUFFIX] build. WorkingDir=~/pepadmin/PepMini/PepDeb64 # If we change servers or locations T*H*I*S line is the O*N*L*Y line to change. * OutFile="/tmp/${PREFIX}${SUFFIX}.out" @@ -24,6 +24,8 @@ LogFile="${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log" _cache="./cache" _break=0 ; _wait=30 # Time (in seconds) to wait +cd ${WorkingDir} + # Run the build script. ./pepbld.sh 2>&1 | tee -a ${OutFile} diff --git a/PepDeb_arm64/BldHelper-release.sh b/PepDeb_arm64/BldHelper-release.sh index 07cb87b..05d5f94 100755 --- a/PepDeb_arm64/BldHelper-release.sh +++ b/PepDeb_arm64/BldHelper-release.sh @@ -8,7 +8,7 @@ PREFIX=PepMini # Sets a unique final name of the ISO and checksum so only removes 2 files . SUFFIX=arm64 # Also used by . And to distinguish between amd64 and x86 or devuan and ubuntu . -BUILD=PepMini # Sets which pepbld.sh to use and the location in /var/www/html/[release|rc|testing|nightly|unstable] +BUILD=release # Sets which pepbld.sh to use and the location in /var/www/html/[release|rc|testing|nightly|unstable] ################################################## ### ## # Make NO Edits Below This Line !! # ## ### @@ -16,7 +16,7 @@ BUILD=PepMini # Sets which pepbld.sh to use and the location in /var/www/html/[ TODAY=$(date -u +"%Y-%m-%d") && export TODAY # If MasterBuilder.sh is used IT will set the date. If not used, we set it here. FileName="${PREFIX}-${SUFFIX}" # This will give a uniquely named and dated ISO and checksum for . -LOCATION=/var/www/html/nightly/${BUILD} # Tells and the script which 2 files to remove and where to put them. +LOCATION=/var/www/html/${BUILD} # Tells and the script which 2 files to remove and where to put them. LogDir=/var/log/Live-Build # This folder contains a log for the last $[PREFIX]-$[SUFFIX] build. WorkingDir=~/pepadmin/PepMini/PepDeb_arm64 # If we change servers or locations T*H*I*S line is the O*N*L*Y line to change. * OutFile="/tmp/${PREFIX}${SUFFIX}.out" @@ -27,6 +27,7 @@ _break=0 ; _wait=30 # Time (in seconds) to wait # Run the build script. ./pepbld.sh 2>&1 | tee -a ${OutFile} + cd ${WorkingDir} # Timing matters, don't destroy the old one without a replacement. # Check for the ISO to appear and wait for things to settle. diff --git a/PepDev32/BldHelper-release.sh b/PepDev32/BldHelper-release.sh index e4b6986..d60e264 100755 --- a/PepDev32/BldHelper-release.sh +++ b/PepDev32/BldHelper-release.sh @@ -8,7 +8,7 @@ PREFIX=PepMiniDev # Sets a unique final name of the ISO and checksum so only removes 2 files . SUFFIX=i386 # Also used by . And to distinguish between amd64 and x86 or devuan and ubuntu . -BUILD=PepMini # Sets which pepbld.sh to use and the location in /var/www/html/[release|rc|testing|nightly|unstable] +BUILD=release # Sets which pepbld.sh to use and the location in /var/www/html/[release|rc|testing|nightly|unstable] ################################################## ### ## # Make NO Edits Below This Line !! # ## ### @@ -16,7 +16,7 @@ BUILD=PepMini # Sets which pepbld.sh to use and the location in /var/www/html/[ TODAY=$(date -u +"%Y-%m-%d") && export TODAY # If MasterBuilder.sh is used IT will set the date. If not used, we set it here. FileName="${PREFIX}-${SUFFIX}" # This will give a uniquely named and dated ISO and checksum for . -LOCATION=/var/www/html/nightly/${BUILD} # Tells and the script which 2 files to remove and where to put them. +LOCATION=/var/www/html/${BUILD} # Tells and the script which 2 files to remove and where to put them. LogDir=/var/log/Live-Build # This folder contains a log for the last $[PREFIX]-$[SUFFIX] build. WorkingDir=~/pepadmin/PepMini/PepDev32 # If we change servers or locations T*H*I*S line is the O*N*L*Y line to change. * OutFile="/tmp/${PREFIX}${SUFFIX}.out" @@ -24,6 +24,8 @@ LogFile="${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log" _cache="./cache" _break=0 ; _wait=30 # Time (in seconds) to wait +cd ${WorkingDir} + # Run the build script. ./pepbld.sh 2>&1 | tee -a ${OutFile} diff --git a/PepDev64/BldHelper-release.sh b/PepDev64/BldHelper-release.sh index 8c4dbc3..8c03b96 100755 --- a/PepDev64/BldHelper-release.sh +++ b/PepDev64/BldHelper-release.sh @@ -8,7 +8,7 @@ PREFIX=PepMiniDev # Sets a unique final name of the ISO and checksum so only removes 2 files . SUFFIX=amd64 # Also used by . And to distinguish between amd64 and x86 or devuan and ubuntu . -BUILD=PepMini # Sets which pepbld.sh to use and the location in /var/www/html/[release|rc|testing|nightly|unstable] +BUILD=release # Sets which pepbld.sh to use and the location in /var/www/html/[release|rc|testing|nightly|unstable] ################################################## ### ## # Make NO Edits Below This Line !! # ## ### @@ -16,7 +16,7 @@ BUILD=PepMini # Sets which pepbld.sh to use and the location in /var/www/html/[ TODAY=$(date -u +"%Y-%m-%d") && export TODAY # If MasterBuilder.sh is used IT will set the date. If not used, we set it here. FileName="${PREFIX}-${SUFFIX}" # This will give a uniquely named and dated ISO and checksum for . -LOCATION=/var/www/html/nightly/${BUILD} # Tells and the script which 2 files to remove and where to put them. +LOCATION=/var/www/html/${BUILD} # Tells and the script which 2 files to remove and where to put them. LogDir=/var/log/Live-Build # This folder contains a log for the last $[PREFIX]-$[SUFFIX] build. WorkingDir=~/pepadmin/PepMini/PepDev64 # If we change servers or locations T*H*I*S line is the O*N*L*Y line to change. * OutFile="/tmp/${PREFIX}${SUFFIX}.out" @@ -27,6 +27,7 @@ _break=0 ; _wait=30 # Time (in seconds) to wait # Run the build script. ./pepbld.sh 2>&1 | tee -a ${OutFile} + cd ${WorkingDir} # Timing matters, don't destroy the old one without a replacement. # Check for the ISO to appear and wait for things to settle. diff --git a/PepDev_arm64/BldHelper-release.sh b/PepDev_arm64/BldHelper-release.sh index fada8ae..e62f8c2 100755 --- a/PepDev_arm64/BldHelper-release.sh +++ b/PepDev_arm64/BldHelper-release.sh @@ -8,7 +8,7 @@ PREFIX=PepMiniDev # Sets a unique final name of the ISO and checksum so only removes 2 files . SUFFIX=arm64 # Also used by . And to distinguish between amd64 and x86 or devuan and ubuntu . -BUILD=PepMini # Sets which pepbld.sh to use and the location in /var/www/html/[release|rc|testing|nightly|unstable] +BUILD=release # Sets which pepbld.sh to use and the location in /var/www/html/[release|rc|testing|nightly|unstable] ################################################## ### ## # Make NO Edits Below This Line !! # ## ### @@ -16,7 +16,7 @@ BUILD=PepMini # Sets which pepbld.sh to use and the location in /var/www/html/[ TODAY=$(date -u +"%Y-%m-%d") && export TODAY # If MasterBuilder.sh is used IT will set the date. If not used, we set it here. FileName="${PREFIX}-${SUFFIX}" # This will give a uniquely named and dated ISO and checksum for . -LOCATION=/var/www/html/nightly/${BUILD} # Tells and the script which 2 files to remove and where to put them. +LOCATION=/var/www/html/${BUILD} # Tells and the script which 2 files to remove and where to put them. LogDir=/var/log/Live-Build # This folder contains a log for the last $[PREFIX]-$[SUFFIX] build. WorkingDir=~/pepadmin/PepMini/PepDev_arm64 # If we change servers or locations T*H*I*S line is the O*N*L*Y line to change. * OutFile="/tmp/${PREFIX}${SUFFIX}.out" @@ -24,6 +24,8 @@ LogFile="${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log" _cache="./cache" _break=0 ; _wait=30 # Time (in seconds) to wait +cd ${WorkingDir} + # Run the build script. ./pepbld.sh 2>&1 | tee -a ${OutFile} diff --git a/buildall.sh b/buildall.sh index 15f84df..ca59eb2 100755 --- a/buildall.sh +++ b/buildall.sh @@ -1,4 +1,7 @@ #!/bin/bash + +git pull --ff + ./PepDeb32.sh ./PepDeb64.sh ./PepDeb_arm64.sh