atualizaçao dos scripts de construçao e de outroficheiros

BldHelper-release.sh

@@ -1,73 +0,0 @@
-#!/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.
-# From PepDistroConfigs, these repos are ../PepProPixMaps & ../PepProTools and are vital to having a working build.
-
-### ## # Set build working variables HERE # ## ###
-
-PREFIX=My-distro-ubuntu 	# Sets a unique final name of the ISO and checksum so <HouseKeeping> only removes 2 files .
-SUFFIX=amd64		# Also used by <HouseKeeping>. 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.
-FileName="${PREFIX}-${SUFFIX}"				# This will give a uniquely named and dated ISO and checksum for <HouseKeeping>.
-LOCATION=/var/www/acoroslinux.tk/iso-builds/${BUILD}				# Tells <HouseKeeping> 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.
-WorkDir=/repos/builds/my-distro-builds/	# * If we change servers or locations T*H*I*S line is the O*N*L*Y line to change. *
-_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-ubuntu && git pull --ff-only
-
-# Run the build script - expect 50 minutes, allow 60.
- ./build.sh 2>&1 | tee -a /tmp/${FileName}.out
-
-
-# Timing matters, don't destroy the old one without a replacement.
-# Check for the ISO to appear and wait for things to settle.
-until [ -e build/*.iso ]
-      do ((++_break))
-	 [ $_break -gt $_wait ] && break || sleep 1
-done
-
-if [ ${_break} -lt ${_wait} ] ; then
-### 10 June, 2022 - After 17 June, this comment and the following line can be removed
-echo -e "\n\tISO appeared after $_break seconds.\n" | tee --append /tmp/${FileName}.out
-
-mv build/*.iso build/${FileName}.iso
-
-# Make the checksum file.
-cd build
-echo "# ${FileName} ${TODAY}" > ${FileName}-sha512.checksum
-sha512sum ${FileName}.iso >> ${FileName}-sha512.checksum
-
-### <HouseKeeping>
-# Remove the previous files in ${LOCATION} .
-rm -f ${LOCATION}/${FileName}*.iso
-rm -f ${LOCATION}/${FileName}*-sha512.checksum
-
-#mv $(FileName}*  ${LOCATION}/
-mv ${FileName}.iso             ${LOCATION}/${FileName}.iso
-mv ${FileName}-sha512.checksum ${LOCATION}/${FileName}-sha512.checksum
-
-# touch -t ${_stamp} ${LOCATION} ${LOCATION}/${FileName}*
-touch ${LOCATION}/${FileName}*
-
-lb clean &
-
-# Move the log file to the log directory.
-[ ! -e ${LogDir} ] && mkdir -p ${LogDir}
-mv /tmp/${FileName}.out ${LogDir}/${FileName}-${BUILD}.log
-### </HouseKeeping>
-
-else echo -e "\n\tAfter $_break seconds, ISO never appeared.\n" | tee --append /tmp/${FileName}.out
-     mv /tmp/${FileName}.out ${LogDir}/${FileName}-${BUILD}.log
-fi
-

BldHelper.sh

@@ -0,0 +1,50 @@
+#!/bin/bash
+
+################################################################################
+# Title:        Bldhelper.sh
+# Description:  Script to build My-distro ISO image
+# Author:       manuel rosa <manuelsilvarosa@gmail.com>
+# Date:         Outubro 29, 2023
+# License:      GPL-3.0-or-later
+################################################################################
+
+# Set environment variables
+PREFIX=My-distro-ubuntu
+SUFFIX=amd64
+BUILD=ubuntu-64
+FileName="${PREFIX}-${SUFFIX}"
+LOCATION=$HOME/out/${BUILD}
+LogDir=$HOME/logs
+WorkingDir=$HOME/My-distro-configs-ubuntu
+
+# Execute the ISO building script
+cd ${WorkingDir}
+./build.sh
+
+# Move and rename the ISO file
+cd build
+mv *.iso ${FileName}-${TODAY}.iso
+
+# Create the checksum file for the ISO
+sha512sum ${FileName}-${TODAY}.iso > ${FileName}-${TODAY}-sha512.checksum
+
+# Remove old ISO and checksum files from the desired location
+rm -f ${LOCATION}/${FileName}*.iso
+rm -f ${LOCATION}/${FileName}*-sha512.checksum
+
+# Move the ISO and checksum files to the desired location
+mkdir -p ${LOCATION}
+mv ${FileName}-${TODAY}.iso ${LOCATION}
+mv ${FileName}-${TODAY}-sha512.checksum ${LOCATION}
+
+# Move the log file to the log directory (if it exists)
+if [ -f /tmp/${PREFIX}${SUFFIX}.out ]; then
+    mv /tmp/${PREFIX}${SUFFIX}.out ${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log
+fi
+
+# Clean the build folder 
+lb clean
+
+# Remove the "build" directory and its contents
+cd ..
+rm -rf build

bootloaders/boot/grub/grub.cfg

@@ -1,7 +1,7 @@
 source /boot/grub/config.cfg
 
 menuentry "My-distro Live" {
-  linux  /live/vmlinuz boot=live components splash quiet locales=pt_PT.UTF-8 keyboard-layouts=pt username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}"
+  linux  /live/vmlinuz boot=live components splash quiet username=user hostname=My-distro autologin "${loopback}"
   initrd /live/initrd.img
 }
 menuentry "My-distro Live (fail-safe mode)" {