summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2020-11-21 22:43:18 +0100
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2020-11-22 14:43:01 +0100
commit5f36aed4bfd5e78a9edc322b8dae2c1e10ff733d (patch)
tree32742fe5c1e5eb8301ffbef13736162658134cf6
parentdfe9d63640f27d88d4d89cb2237579319b5ac952 (diff)
downloadrockbox-5f36aed4bfd5e78a9edc322b8dae2c1e10ff733d.tar.gz
rockbox-5f36aed4bfd5e78a9edc322b8dae2c1e10ff733d.tar.bz2
rockbox-5f36aed4bfd5e78a9edc322b8dae2c1e10ff733d.zip
rbutil: Unify template parameter for release version.
Don't use different parameter names for the same parameter. Change-Id: I3800d2ed7dcecf76b111b15945d62449efa70bcc
-rw-r--r--rbutil/rbutilqt/gui/selectiveinstallwidget.cpp2
-rw-r--r--rbutil/rbutilqt/rbutil.ini8
2 files changed, 5 insertions, 5 deletions
diff --git a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp
index ef54a918ab..88b085e9b3 100644
--- a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp
+++ b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp
@@ -483,7 +483,7 @@ void SelectiveInstallWidget::installFonts(void)
logversion = installInfo.release();
}
fontsurl = SystemInfo::value(SystemInfo::FontUrl, m_buildtype).toString();
- fontsurl.replace("%RELEASEVER%", relversion);
+ fontsurl.replace("%RELVERSION%", relversion);
// create new zip installer
if(m_zipinstaller != nullptr) m_zipinstaller->deleteLater();
diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini
index f680a15fe2..f92d746614 100644
--- a/rbutil/rbutilqt/rbutil.ini
+++ b/rbutil/rbutilqt/rbutil.ini
@@ -23,14 +23,14 @@ download_url=http://download.rockbox.org/bootloader
[release]
build_url=https://download.rockbox.org/release/%RELVERSION%/rockbox-%MODEL%-%RELVERSION%.zip
voice_url=https://download.rockbox.org/release/%RELVERSION%/%MODEL%-%RELVERSION%-%LANGUAGE%.zip
-font_url=https://download.rockbox.org/release/%RELEASEVER%/rockbox-fonts-%RELEASEVER%.zip
-manual_url=https://download.rockbox.org/release/%RELEASEVER%/rockbox-%MODEL%%FORMAT%
+font_url=https://download.rockbox.org/release/%RELVERSION%/rockbox-fonts-%RELVERSION%.zip
+manual_url=https://download.rockbox.org/release/%RELVERSION%/rockbox-%MODEL%%FORMAT%
[release-candidate]
build_url=https://download.rockbox.org/release-candidate/%RELVERSION%/rockbox-%MODEL%-%RELVERSION%.zip
voice_url=https://download.rockbox.org/release-candidate/%RELVERSION%/%MODEL%-%RELVERSION%-english.zip
-font_url=https://download.rockbox.org/release-candidate/%RELEASEVER%/rockbox-fonts-%RELEASEVER%.zip
-manual_url=https://download.rockbox.org/release-candidate/%RELEASEVER%/rockbox-%MODEL%%FORMAT%
+font_url=https://download.rockbox.org/release-candidate/%RELVERSION%/rockbox-fonts-%RELVERSION%.zip
+manual_url=https://download.rockbox.org/release-candidate/%RELVERSION%/rockbox-%MODEL%%FORMAT%
[development]
build_url=http://build.rockbox.org/data/rockbox-%MODEL%.zip