80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #2419 from rderooy/master

Browse Source 
Fix regex bug
This commit is contained in:
Miran Grča
2022-07-03 23:08:37 +02:00
committed by GitHub
parent 49bf8c3aae 15e93eaa89
commit d6e0932bc8
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
bumpversion.sh
View File

@@ -17,28 +17,30 @@
# Parse arguments. # Parse arguments.
newversion="$1" newversion="$1"
if [ -z "$(echo $newversion | grep '\.')" ] romversion="$2"
if [ -z "$(echo "$newversion" | grep '\.')" ]
then then
echo '[!] Usage: bumpversion.sh x.y[.z]' echo '[!] Usage: bumpversion.sh x.y[.z] [romversion]'
exit 1 exit 1
fi fi
shift shift
# Extract version components. # Extract version components.
newversion_maj=$(echo $newversion | cut -d. -f1) newversion_maj=$(echo "$newversion" | cut -d. -f1)
newversion_min=$(echo $newversion | cut -d. -f2) newversion_min=$(echo "$newversion" | cut -d. -f2)
newversion_patch=$(echo $newversion | cut -d. -f3) newversion_patch=$(echo "$newversion" | cut -d. -f3)
[ -z "$newversion_patch" ] && newversion_patch=0 [ -z "$newversion_patch" ] && newversion_patch=0
# Switch to the repository root directory.
cd "$(dirname "$0")"
get_latest_rom_release() { if [ -z "${romversion}" ]; then
# Get the latest ROM release from the GitHub API. # Get the latest ROM release from the GitHub API.
curl --silent "https://api.github.com/repos/86Box/roms/releases/latest" | romversion=$(curl --silent "https://api.github.com/repos/86Box/roms/releases/latest" |
grep '"tag_name":' | grep '"tag_name":' |
sed -E 's/.*"([^"]+)".*/\1/' sed -E 's/.*"([^"]+)".*/\1/')
} fi
# Switch to the repository root directory.
cd "$(dirname "$0")" || exit
pretty_date() { pretty_date() {
# Ensure we get the date in English. # Ensure we get the date in English.
@@ -67,7 +69,7 @@ patch_file src/include_make/*/version.h EMU_VERSION_PATCH 's/(#\s*define\s+EMU_V
patch_file src/include_make/*/version.h COPYRIGHT_YEAR 's/(#\s*define\s+COPYRIGHT_YEAR\s+)[0-9]+/\1'"$(date +%Y)"'/' patch_file src/include_make/*/version.h COPYRIGHT_YEAR 's/(#\s*define\s+COPYRIGHT_YEAR\s+)[0-9]+/\1'"$(date +%Y)"'/'
patch_file src/include_make/*/version.h EMU_DOCS_URL 's/(#\s*define\s+EMU_DOCS_URL\s+"https:\/\/[^\/]+\/en\/v)[^\/]+/\1'"$newversion_maj.$newversion_min"'/' patch_file src/include_make/*/version.h EMU_DOCS_URL 's/(#\s*define\s+EMU_DOCS_URL\s+"https:\/\/[^\/]+\/en\/v)[^\/]+/\1'"$newversion_maj.$newversion_min"'/'
patch_file src/unix/assets/*.spec Version 's/(Version:\s+)[0-9].+/\1'"$newversion"'/' patch_file src/unix/assets/*.spec Version 's/(Version:\s+)[0-9].+/\1'"$newversion"'/'
patch_file src/unix/assets/*.spec '%global romver' 's/(^%global\ romver\s+)[0-9]{8}/'"$(get_latest_rom_release)"'/' patch_file src/unix/assets/*.spec '%global romver' 's/(^%global\ romver\s+)[0-9]{8}/\1'"$romversion"'/'
patch_file src/unix/assets/*.spec 'changelog version' 's/(^[*]\s.*>\s+)[0-9].+/\1'"$newversion"-1'/' patch_file src/unix/assets/*.spec 'changelog version' 's/(^[*]\s.*>\s+)[0-9].+/\1'"$newversion"-1'/'
patch_file src/unix/assets/*.spec 'changelog date' 's/(^[*]\s)[a-zA-Z]{3}\s[a-zA-Z]{3}\s[0-9]{2}\s[0-9]{4}/\1'"$(pretty_date)"'/' patch_file src/unix/assets/*.spec 'changelog date' 's/(^[*]\s)[a-zA-Z]{3}\s[a-zA-Z]{3}\s[0-9]{2}\s[0-9]{4}/\1'"$(pretty_date)"'/'
patch_file src/unix/assets/*.metainfo.xml release 's/(<release version=")[^"]+(" date=")[^"]+/\1'"$newversion"'\2'"$(date +%Y-%m-%d)"'/' patch_file src/unix/assets/*.metainfo.xml release 's/(<release version=")[^"]+(" date=")[^"]+/\1'"$newversion"'\2'"$(date +%Y-%m-%d)"'/'

4
src/unix/assets/86Box.spec
View File

@@ -12,7 +12,7 @@
# After a successful build, you can install the RPMs as follows: # After a successful build, you can install the RPMs as follows:
# sudo dnf install RPMS/$(uname -m)/86Box-3* RPMS/noarch/86Box-roms* # sudo dnf install RPMS/$(uname -m)/86Box-3* RPMS/noarch/86Box-roms*
20220523 %global romver 20220701
Name: 86Box Name: 86Box
Version: 3.6 Version: 3.6
@@ -120,5 +120,5 @@ popd
%{_bindir}/roms %{_bindir}/roms
%changelog %changelog
* Mon Jun 27 2022 Robert de Rooy <robert.de.rooy[AT]gmail.com> 3.6-1 * Fri Jul 01 2022 Robert de Rooy <robert.de.rooy[AT]gmail.com> 3.6-1
- Bump release - Bump release