From d607422155148ae3e528b49ef04bd387907d0bea Mon Sep 17 00:00:00 2001 From: Manuel Date: Tue, 28 Mar 2023 14:30:31 +0000 Subject: [PATCH] update build scripts --- PepDeb32/BldHelper-release.sh | 6 ++---- PepDeb64/BldHelper-release.sh | 4 +--- PepDeb_arm64/BldHelper-release.sh | 4 +--- PepDev32/BldHelper-release.sh | 4 +--- PepDev64/BldHelper-release.sh | 4 +--- PepDev_arm64/BldHelper-release.sh | 4 +--- 6 files changed, 7 insertions(+), 19 deletions(-) diff --git a/PepDeb32/BldHelper-release.sh b/PepDeb32/BldHelper-release.sh index 8a7b8d4..2090240 100755 --- a/PepDeb32/BldHelper-release.sh +++ b/PepDeb32/BldHelper-release.sh @@ -18,17 +18,15 @@ TODAY=$(date -u +"%Y-%m-%d") && export TODAY # If MasterBuilder.sh is used IT FileName="${PREFIX}-${SUFFIX}" # This will give a uniquely named and dated ISO and checksum for . 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. * +WorkingDir=/home/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" LogFile="${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log" _cache="./cache" _break=0 ; _wait=30 # Time (in seconds) to wait - -cd ${WorkingDir}/../ cd ${WorkingDir} # Run the build script. - ./pepbld.sh 2>&1 | tee -a ${OutFile} +./pepbld.sh 2>&1 | tee -a ${OutFile} # Timing matters, don't destroy the old one without a replacement. diff --git a/PepDeb64/BldHelper-release.sh b/PepDeb64/BldHelper-release.sh index 841efd7..77baa5a 100755 --- a/PepDeb64/BldHelper-release.sh +++ b/PepDeb64/BldHelper-release.sh @@ -18,13 +18,11 @@ TODAY=$(date -u +"%Y-%m-%d") && export TODAY # If MasterBuilder.sh is used IT FileName="${PREFIX}-${SUFFIX}" # This will give a uniquely named and dated ISO and checksum for . 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. * +WorkingDir=/home/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" LogFile="${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log" _cache="./cache" _break=0 ; _wait=30 # Time (in seconds) to wait - -cd ${WorkingDir}/../ cd ${WorkingDir} # Run the build script. diff --git a/PepDeb_arm64/BldHelper-release.sh b/PepDeb_arm64/BldHelper-release.sh index 7f6fc80..aeace7e 100755 --- a/PepDeb_arm64/BldHelper-release.sh +++ b/PepDeb_arm64/BldHelper-release.sh @@ -18,7 +18,7 @@ TODAY=$(date -u +"%Y-%m-%d") && export TODAY # If MasterBuilder.sh is used IT FileName="${PREFIX}-${SUFFIX}" # This will give a uniquely named and dated ISO and checksum for . 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. * +WorkingDir=/home/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" LogFile="${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log" _cache="./cache" @@ -26,8 +26,6 @@ _break=0 ; _wait=30 # Time (in seconds) to wait # Run the build script. ./pepbld.sh 2>&1 | tee -a ${OutFile} - -cd ${WorkingDir}/../ cd ${WorkingDir} # Timing matters, don't destroy the old one without a replacement. diff --git a/PepDev32/BldHelper-release.sh b/PepDev32/BldHelper-release.sh index 8c31827..f60908c 100755 --- a/PepDev32/BldHelper-release.sh +++ b/PepDev32/BldHelper-release.sh @@ -18,13 +18,11 @@ TODAY=$(date -u +"%Y-%m-%d") && export TODAY # If MasterBuilder.sh is used IT FileName="${PREFIX}-${SUFFIX}" # This will give a uniquely named and dated ISO and checksum for . 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. * +WorkingDir=/home/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" LogFile="${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log" _cache="./cache" _break=0 ; _wait=30 # Time (in seconds) to wait - -cd ${WorkingDir}/../ cd ${WorkingDir} # Run the build script. diff --git a/PepDev64/BldHelper-release.sh b/PepDev64/BldHelper-release.sh index d441153..586a709 100755 --- a/PepDev64/BldHelper-release.sh +++ b/PepDev64/BldHelper-release.sh @@ -18,7 +18,7 @@ TODAY=$(date -u +"%Y-%m-%d") && export TODAY # If MasterBuilder.sh is used IT FileName="${PREFIX}-${SUFFIX}" # This will give a uniquely named and dated ISO and checksum for . 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. * +WorkingDir=/home/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" LogFile="${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log" _cache="./cache" @@ -26,8 +26,6 @@ _break=0 ; _wait=30 # Time (in seconds) to wait # Run the build script. ./pepbld.sh 2>&1 | tee -a ${OutFile} - -cd ${WorkingDir}/../ cd ${WorkingDir} # Timing matters, don't destroy the old one without a replacement. diff --git a/PepDev_arm64/BldHelper-release.sh b/PepDev_arm64/BldHelper-release.sh index d5609a3..536cd00 100755 --- a/PepDev_arm64/BldHelper-release.sh +++ b/PepDev_arm64/BldHelper-release.sh @@ -18,13 +18,11 @@ TODAY=$(date -u +"%Y-%m-%d") && export TODAY # If MasterBuilder.sh is used IT FileName="${PREFIX}-${SUFFIX}" # This will give a uniquely named and dated ISO and checksum for . 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. * +WorkingDir=/home/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" LogFile="${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log" _cache="./cache" _break=0 ; _wait=30 # Time (in seconds) to wait - -cd ${WorkingDir}/../ cd ${WorkingDir} # Run the build script.