From 65607909aa756f360dc079f26e406804d8d16515 Mon Sep 17 00:00:00 2001 From: Manuel Date: Sat, 19 Nov 2022 13:04:04 -0100 Subject: [PATCH] new commit --- BldHelper-32-non-pae-release.sh | 9 ++++----- BldHelper-32-release.sh | 5 ++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/BldHelper-32-non-pae-release.sh b/BldHelper-32-non-pae-release.sh index f595699f..20b838ad 100755 --- a/BldHelper-32-non-pae-release.sh +++ b/BldHelper-32-non-pae-release.sh @@ -6,15 +6,14 @@ ### ## # Set build working variables HERE # ## ### -PREFIX=My-distro-debian # Sets a unique final name of the ISO and checksum so only removes 2 files . +PREFIX=My-distro # 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=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 !! # ## ### ################################################## - -[ $TODAY ! = " " ] || TODAY=$(date -u +"%Y-%m-%d") # If MasterBuilder.sh is used IT will set the date. If not used, we set it here. + $TODAY ! = " " ] || TODAY=$(date -u +"%Y-%m-%d") # 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/acoroslinux.tk/iso-builds/${BUILD} # Tells and the script which 2 files to remove and where to put them. LogDir=/repos/builds/my-distro-builds/logs/ # This folder contains a log for the last $[PREFIX]-$[SUFFIX] build. @@ -23,8 +22,8 @@ _break=0 ; _wait=30 # Time (in seconds) to wait # Move into the builder directory. # Make sure the local repos are up to date. -cd /repos/builds/my-distro-builds/ -cd ./My-distro-configs-debian && git pull --ff-only +cd /repos/builds/my-distro-builds/ +cd ./My-distro-configs-debian && git pull --ff-only # Run the build script - expect 50 minutes, allow 60. ./build-32-non-pae.sh 2>&1 | tee -a /tmp/${FileName}.out diff --git a/BldHelper-32-release.sh b/BldHelper-32-release.sh index 698c347c..fca5b00f 100755 --- a/BldHelper-32-release.sh +++ b/BldHelper-32-release.sh @@ -6,15 +6,14 @@ ### ## # Set build working variables HERE # ## ### -PREFIX=My-distro-debian # Sets a unique final name of the ISO and checksum so only removes 2 files . +PREFIX=My-distro # Sets a unique final name of the ISO and checksum so only removes 2 files . SUFFIX=i386-pae # Also used by . And to distinguish between amd64 and x86 or devuan and ubuntu . 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 !! # ## ### ################################################## - -[ $TODAY ! = " " ] || TODAY=$(date -u +"%Y-%m-%d") # If MasterBuilder.sh is used IT will set the date. If not used, we set it here. + $TODAY ! = " " ] || TODAY=$(date -u +"%Y-%m-%d") # 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/acoroslinux.tk/iso-builds/${BUILD} # Tells and the script which 2 files to remove and where to put them. LogDir=/repos/builds/my-distro-builds/logs/ # This folder contains a log for the last $[PREFIX]-$[SUFFIX] build.