Fix build script naming for Alpha releases

CloverPackage/makeV2

@@ -7,12 +7,21 @@ cd "$(dirname $([ -L $0 ] && readlink $0 || echo $0))"
 ROOT="$PWD"
 SYMROOT="${ROOT}"/sym
 mkdir -p "$SYMROOT"
+
 REVISION=$(git describe --tags "$(git rev-list --tags --max-count=1)")
 
+# Keep the traditional "r" prefix for numeric tags only.
+# Non-numeric tags are used exactly as they are.
+if [[ "$REVISION" =~ ^[0-9]+$ ]]; then
+    REVISION="r${REVISION}"
+fi
+
 # Remove previous revision zip
 rm -rf $SYMROOT/CloverV2-*.zip
+
 # zip CloverV2, excluding all .empty and all .DS_Store
 zip -qr CloverV2-${REVISION}.zip CloverV2 -x "*/.DS_Store" "*/.empty"
+
 mv CloverV2-${REVISION}.zip $SYMROOT
 
 open "$SYMROOT"

CloverPackage/makeiso

@@ -25,6 +25,13 @@ EFIROOT=${SRCROOT}/CloverV2/EFI
 BASETOOLS_DIR=${SRCROOT}/../BaseTools/Source/C/bin
 
 REVISION=$(git describe --tags $(git rev-list --tags --max-count=1))
+
+# Keep the traditional "r" prefix for numeric tags only.
+# Non-numeric tags are used exactly as they are.
+if [[ "$REVISION" =~ ^[0-9]+$ ]]; then
+    REVISION="r${REVISION}"
+fi
+
 PRODUCT=Clover-${REVISION}
 CDLABEL=${PRODUCT}-X64
 ISOIMAGE=${SYMROOT}/${CDLABEL}.iso
@@ -146,15 +153,18 @@ cp -f ${CLOVERROOT}/BootSectors/boot1f32 ${IMGROOT}/usr/standalone/i386
 cp -f ${CLOVERROOT}/BootSectors/boot1f32alt ${IMGROOT}/usr/standalone/i386
 cp -f ${CLOVERROOT}/BootSectors/boot1x    ${IMGROOT}/usr/standalone/i386
 cp -f ${CLOVERROOT}/BootSectors/boot1xalt ${IMGROOT}/usr/standalone/i386
+
 # #ifdef CONFIG_FDISK440
 # 	cp -f ${CLOVERROOT}/BootSectors/fdisk440 ${IMGROOT}/usr/bin
 # #endif
+
 rm -rf ${IMGROOT}/.s*
 rm -rf ${IMGROOT}/*/.s*
 rm -rf ${IMGROOT}/*/*/.s*
 rm -rf ${IMGROOT}/*/*/*/.s*
 rm -rf ${IMGROOT}/*/*/*/*/.s*
 find "${IMGROOT}" -name '.DS_Store' -exec rm -R -f {} \; 2>/dev/null
+
 echo "[HDIUTIL] ${ISOIMAGE}"
 mkdir -p ${SYMROOT}/CloverISO-${REVISION}
 
@@ -165,16 +175,20 @@ hdiutil makehybrid -iso -joliet -hfs -hfs-volume-name ${CDLABEL}  \
  -eltorito-boot ${CDBOOT} -no-emul-boot -ov -o "${ISOIMAGE}"      \
  ${IMGROOT} -quiet
 fi
+
 mv -f ${ISOIMAGE} ${SYMROOT}/CloverISO-${REVISION}/
+
 echo "[TAR] CloverISO-${REVISION}"
 tar -cv -f ${SYMROOT}/CloverISO-${REVISION}.tar -C ${SYMROOT}/CloverISO-${REVISION} .
+
 echo "[LZMA] CloverISO-${REVISION}"
 
 if [[ "$SYSNAME" == Linux ]]; then
 xz -f -S .lzma ${SYMROOT}/CloverISO-${REVISION}.tar
 else
-"$BASETOOLS_DIR"/LzmaCompress -e -o ${SYMROOT}/CloverISO-${REVISION}.tar.lzma ${SYMROOT}/CloverISO-${REVISION}.tar 
+"$BASETOOLS_DIR"/LzmaCompress -e -o ${SYMROOT}/CloverISO-${REVISION}.tar.lzma ${SYMROOT}/CloverISO-${REVISION}.tar
 fi
+
 rm -rf ${SYMROOT}/CloverISO-${REVISION}.tar
 
 # Open the final folder.
@@ -183,4 +197,4 @@ if [[ "${1:-}" == "" ]]; then
     [[ "$SYSNAME" != Linux ]] && open sym
 fi
 
-exit 0
+exit 0

CloverPackage/makepkg

@@ -29,23 +29,30 @@ echo
 }
 
 while [[ $# -gt 0 ]]; do
-	case "${1}" in
-		--nothemes ) NOEXTRAS+=" --nothemes";;
-		# --noprefpane ) NOEXTRAS+=" --noprefpane";;
-		--norc ) NOEXTRAS+=" --norc";;
-		--nolegacy ) NOEXTRAS+=" --nolegacy";;
-		* ) printf "\e[1m%s\e[0m\n" "Invalid option: ${1} !"; usage; exit 1;;
-	esac
-	shift
+    case "${1}" in
+        --nothemes ) NOEXTRAS+=" --nothemes";;
+        # --noprefpane ) NOEXTRAS+=" --noprefpane";;
+        --norc ) NOEXTRAS+=" --norc";;
+        --nolegacy ) NOEXTRAS+=" --nolegacy";;
+        * ) printf "\e[1m%s\e[0m\n" "Invalid option: ${1} !"; usage; exit 1;;
+    esac
+    shift
 done
 
 # Workspace = edk2/Clover/CloverPackage
 
 # Go to the script directory to create the package
-cd "$(dirname $0)"
+cd "$(dirname "$0")"
 
+# Get the latest Git tag.
 revision=$(git describe --tags $(git rev-list --tags --max-count=1))
 
+# Keep the traditional "r" prefix for numeric tags only.
+# Non-numeric tags are used exactly as they are.
+if [[ "$revision" =~ ^[0-9]+$ ]]; then
+    revision="r${revision}"
+fi
+
 SRCROOT="${PWD}"
 SYMROOT="${SRCROOT}"/sym
 PKG_BUILD_DIR="${SYMROOT}"/package
@@ -66,7 +73,7 @@ echo "${revision}" > revision
 # # Create a new sym directory
 # mkdir sym
 
-#   Make the translation
+# Make the translation
 echo ""
 echo "========= Translating Resources ========"
 ./package/translate.sh || exit $?
@@ -83,29 +90,29 @@ if [[ -n "$xcode_path" ]]; then
   # make -C "${SRCROOT}"/CloverPrefpane || exit $?
   # Make utils
   make -C "${SRCROOT}"/utils || exit $?
-# temporary use ready-to-use binaries
-#  mkdir -p "${SYMROOT}"/utils
-#  cp -v "${SRCROOT}"/utils/binaries/* "${SYMROOT}"/utils/
+  # temporary use ready-to-use binaries
+  # mkdir -p "${SYMROOT}"/utils
+  # cp -v "${SRCROOT}"/utils/binaries/* "${SYMROOT}"/utils/
 fi
 
 # Start to build installer.
-
 package/buildpkg.sh --srcroot "$SRCROOT" --symroot "sym" --builddir "$PKG_BUILD_DIR" ${NOEXTRAS:1} || exit $?
 
 #(cd sym ; zip Clover_r${revision}.zip \
 # Clover_r${revision}.pkg              \
 # Clover_r${revision}.pkg.md5 )
 
 # Workspace = edk2/Clover/CloverPackage/
-# Remove temp files.
 
-rm -f  version # take this to clean old sources
-rm -f  revision
+# Remove temp files.
+rm -f version
+rm -f revision
 
 # Workspace = edk2/Clover/CloverPackage
+
 # Open the final folder.
 ls -la sym
 open sym
-# Finish building installer.
 
+# Finish building installer.
 exit 0

CloverPackage/package/Distribution

@@ -12,7 +12,7 @@
 	<background file='background.tiff' alignment='topleft' scaling='proportional'/>
         <background-darkAqua file='background.tiff' alignment='topleft' scaling='proportional'/>
 
-	<title>Clover r%CLOVERREVISION% EFI bootloader</title>
+	<title>Clover %CLOVERREVISION% EFI bootloader</title>
 
 	<script>
 

CloverPackage/package/Resources/templates/Conclusion.html

@@ -17,7 +17,7 @@
 <body>
 <div>
 <p class="title">Clover EFI</p>
-<p class="version">r%CLOVERREVISION%</p>
+<p class="version">%CLOVERREVISION%</p>
 <p class="p0"><br/></p>
 <p class="complete">Installation Complete!</p>
 </div>

CloverPackage/package/Resources/templates/Welcome.html

@@ -28,7 +28,7 @@
 <body>
 <div>
 <p class="title">Clover EFI</p>
-<p class="version">r%CLOVERREVISION% (%CLOVERSHA1%)</p>
+<p class="version">%CLOVERREVISION% (%CLOVERSHA1%)</p>
 </div>
 <p class="p0"><br/></p>
 <p class="p1">Developers:</p>

CloverPackage/package/Scripts.templates/EFIFolder/preinstall

@@ -59,7 +59,7 @@ export -f GetNVRamKey
 # ---------------------------------------------
 echo "" > "$install_log"
 echo "Clover EFI installer log - $( date )" >> "$install_log"
-echo "Installer version: r%CLOVERREVISION% (commit: %CLOVERSHA1%) EFI bootloader" >> "$install_log"
+echo "Installer version: %CLOVERREVISION% (commit: %CLOVERSHA1%) EFI bootloader" >> "$install_log"
 echo "======================================================" >> "$install_log"
 diskutil list >> "$install_log"
 

CloverPackage/package/buildpkg.sh

@@ -1760,7 +1760,11 @@ generateChoices() {
 makedistribution ()
 {
     declare -r distributionDestDir="${SYMROOT}"
-    declare -r distributionFilename="${packagename// /}_r${CLOVER_REVISION}.pkg"
+    if [[ "$CLOVER_REVISION" =~ ^r[0-9]+$ ]]; then
+    declare -r distributionFilename="${packagename// /}_${CLOVER_REVISION}.pkg"
+else
+    declare -r distributionFilename="${CLOVER_REVISION}.pkg"
+fi
     declare -r distributionFilePath="${distributionDestDir}/${distributionFilename}"
 
     rm -f "${distributionDestDir}/${packagename// /}"*.pkg

CloverPackage/package/po/ro.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Clover 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-08-31 07:24+0300\n"
+"POT-Creation-Date: 2026-10-06 22:34+0300\n"
 "PO-Revision-Date: 2019-07-14 21:16+0300\n"
 "Last-Translator: vector sigma\n"
 "Language-Team: ro <ro@li.org>\n"
@@ -25,7 +25,9 @@ msgstr "Clover EFI"
 
 #. type: Content of: <html><body><div><p>
 #: Resources/templates/Welcome.html:31
-msgid "r%CLOVERREVISION% (%CLOVERSHA1%)"
+#, fuzzy
+#| msgid "r%CLOVERREVISION% (%CLOVERSHA1%)"
+msgid "%CLOVERREVISION% (%CLOVERSHA1%)"
 msgstr "r%CLOVERREVISION% (%CLOVERSHA1%)"
 
 #. type: Content of: <html><body><p>
@@ -224,7 +226,9 @@ msgstr ""
 
 #. type: Content of: <html><body><div><p>
 #: Resources/templates/Conclusion.html:20
-msgid "r%CLOVERREVISION%"
+#, fuzzy
+#| msgid "r%CLOVERREVISION%"
+msgid "%CLOVERREVISION%"
 msgstr "r%CLOVERREVISION%"
 
 #. type: Content of: <html><body><div><p>

CloverPackage/package/po/uk_UA.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Clover 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-08-31 07:24+0300\n"
+"POT-Creation-Date: 2026-10-06 22:34+0300\n"
 "PO-Revision-Date: 2018-10-02 11:47+0200\n"
 "Last-Translator: vector sigma\n"
 "Language-Team: ua <ua@li.org>\n"
@@ -26,7 +26,9 @@ msgstr "Кловер EFI"
 
 #. type: Content of: <html><body><div><p>
 #: Resources/templates/Welcome.html:31
-msgid "r%CLOVERREVISION% (%CLOVERSHA1%)"
+#, fuzzy
+#| msgid "r%CLOVERREVISION% (%CLOVERSHA1%)"
+msgid "%CLOVERREVISION% (%CLOVERSHA1%)"
 msgstr "r%CLOVERREVISION% (%CLOVERSHA1%)"
 
 #. type: Content of: <html><body><p>
@@ -229,7 +231,9 @@ msgstr ""
 
 #. type: Content of: <html><body><div><p>
 #: Resources/templates/Conclusion.html:20
-msgid "r%CLOVERREVISION%"
+#, fuzzy
+#| msgid "r%CLOVERREVISION%"
+msgid "%CLOVERREVISION%"
 msgstr "r%CLOVERREVISION%"
 
 #. type: Content of: <html><body><div><p>

buildme

@@ -45,6 +45,10 @@ declare -r CLOVERROOT="$PWD"
 declare -r SYSNAME="$(uname)"
 MYTOOLCHAIN=${1:-GCC161}
 revision=$(git describe --tags $(git rev-list --tags --max-count=1))
+
+if [[ "$revision" =~ ^[0-9]+$ ]]; then
+  revision="r${revision}"
+fi
 lsha1="not a git repo"
 pyversion=$(echo $COL_CYAN"Current Python version: "$COL_WHITE$($(which python3) --version))
 pynone=$(echo -e "$COL_RED    Python3 seems missing on this machine, it is required to build Clover ")
@@ -607,7 +611,7 @@ testing() {
 #clear
 echo
 echo -e $COL_GREEN" ---------------------------------------------------------------------------------"
-echo -e "                          🍀 Clover r${revision}$COL_WHITE (SHA: $lsha1)"
+echo -e "                          🍀 Clover: ${revision}$COL_WHITE (SHA: $lsha1)"
 echo -e $COL_CYAN"                                     Test Builds"
 echo -e $COL_GREEN" ---------------------------------------------------------------------------------"$COL_RESET
 echo -e "\n"
@@ -654,7 +658,7 @@ testing
 Utilities() {
 echo
 echo -e $COL_GREEN" ---------------------------------------------------------------------------------"
-echo -e "                          🍀 Clover r${revision}$COL_WHITE (SHA: $lsha1)"
+echo -e "                          🍀 Clover: ${revision}$COL_WHITE (SHA: $lsha1)"
 echo -e $COL_CYAN"                                  External Utilities "
 echo -e $COL_WHITE"                     All Files will be put on Desktop/ClovUtils"
 echo -e $COL_GREEN" ---------------------------------------------------------------------------------"$COL_RESET
@@ -751,7 +755,7 @@ echo -e $COL_GREEN" ------------------------------------------------------------
 if [[ ! -x "$(which python3)" ]]; then
 	echo -e " ${pynone}"
 fi
-echo -e "$COL_GREEN                           🍀 Clover r${revision}$COL_WHITE (SHA: $lsha1)"
+echo -e "$COL_GREEN                           🍀 Clover: ${revision}$COL_WHITE (SHA: $lsha1)"
 echo -e "$COL_WHITE                              Default TOOLCHAIN:$COL_CYAN $MYTOOLCHAIN$COL_WHITE "
 echo -e "${COL_WHITE}                     Switch to${COL_CYAN} XCODE${COL_WHITE} can be done on${COL_CYAN} Cloverbuilds"
 if [[ -x "$(which python3)" ]]; then
@@ -845,7 +849,7 @@ echo -e $COL_GREEN" ------------------------------------------------------------
 if [[ ! -x "$(which python3)" ]]; then
 	echo -e " ${pynone}"
 fi
-echo -e "$COL_GREEN                           🍀 Clover r${revision}$COL_WHITE (SHA: $lsha1)"
+echo -e "$COL_GREEN                           🍀 Clover: ${revision}$COL_WHITE (SHA: $lsha1)"
 echo -e "$COL_WHITE                              Default TOOLCHAIN:$COL_CYAN $MYTOOLCHAIN$COL_WHITE "
 echo -e "${COL_WHITE}                     Switch to${COL_CYAN} XCODE${COL_WHITE} select:${COL_CYAN} build (with XCode)"
 echo -e "${COL_WHITE}     Depending on your${COL_CYAN} XCODE version${COL_WHITE} the Toolset will be${COL_CYAN} automatically chosen"

xbuildme

@@ -63,7 +63,10 @@ COL_CYAN_ITALIC=$(tput sitm; tput setaf 6)   # Italic Cyan
 COL_WHITE_ITALIC=$(tput sitm; tput setaf 7)  # Italic White
 COL_RESET="\x1b[39;49;00m" 
 
-revision=$(git describe --tags $(git rev-list --tags --max-count=1)) 
+revision=$(git describe --tags $(git rev-list --tags --max-count=1))
+if [[ "$revision" =~ ^[0-9]+$ ]]; then
+  revision="r${revision}"
+fi
 
 # ====== Main Window SetUp ======
 if [[ "$2" != "ci" ]]; then
@@ -83,7 +86,7 @@ fi
 
 # ====== Display Menu ======
 echo -e "${COL_GREEN} ---------------------------------------------------------------------------------"
-echo -e "${COL_GREEN}                           🍀 Clover r${revision} ${COL_WHITE}(SHA: 64d434947)"
+echo -e "${COL_GREEN}                           🍀 Clover: ${revision} ${COL_WHITE}(SHA: 644db0b82)"
 echo -e "${COL_WHITE}                              Default TOOLCHAIN: ${COL_CYAN}GCC161${COL_WHITE}"
 echo -e "${COL_WHITE}                     Switch to ${COL_CYAN}XCODE${COL_WHITE} select: ${COL_CYAN}build (with XCode)"
 echo -e "${COL_WHITE}     Depending on your ${COL_CYAN}XCODE version${COL_WHITE} the Toolset will be ${COL_CYAN}automatically chosen"
@@ -279,7 +282,7 @@ if [[ -d .git ]]; then
   lsha1=$(git rev-parse --short HEAD)
 fi
 
-echo "buildme, Clover v5 r${revision} (SHA: $lsha1)"
+echo "buildme, Clover: ${revision} (SHA: $lsha1)"
 echo "TOOLCHAIN: $MYTOOLCHAIN (override example: './buildme GCC53')"
 echo
 PS3='Please enter your choice: '