diff options
| author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-11-21 22:43:18 +0100 |
|---|---|---|
| committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2020-11-22 14:43:01 +0100 |
| commit | 5f36aed4bfd5e78a9edc322b8dae2c1e10ff733d (patch) | |
| tree | 32742fe5c1e5eb8301ffbef13736162658134cf6 | |
| parent | dfe9d63640f27d88d4d89cb2237579319b5ac952 (diff) | |
| download | rockbox-5f36aed4bfd5e78a9edc322b8dae2c1e10ff733d.tar.gz 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.cpp | 2 | ||||
| -rw-r--r-- | rbutil/rbutilqt/rbutil.ini | 8 |
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) | |||
| 483 | logversion = installInfo.release(); | 483 | logversion = installInfo.release(); |
| 484 | } | 484 | } |
| 485 | fontsurl = SystemInfo::value(SystemInfo::FontUrl, m_buildtype).toString(); | 485 | fontsurl = SystemInfo::value(SystemInfo::FontUrl, m_buildtype).toString(); |
| 486 | fontsurl.replace("%RELEASEVER%", relversion); | 486 | fontsurl.replace("%RELVERSION%", relversion); |
| 487 | 487 | ||
| 488 | // create new zip installer | 488 | // create new zip installer |
| 489 | if(m_zipinstaller != nullptr) m_zipinstaller->deleteLater(); | 489 | 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 | |||
| 23 | [release] | 23 | [release] |
| 24 | build_url=https://download.rockbox.org/release/%RELVERSION%/rockbox-%MODEL%-%RELVERSION%.zip | 24 | build_url=https://download.rockbox.org/release/%RELVERSION%/rockbox-%MODEL%-%RELVERSION%.zip |
| 25 | voice_url=https://download.rockbox.org/release/%RELVERSION%/%MODEL%-%RELVERSION%-%LANGUAGE%.zip | 25 | voice_url=https://download.rockbox.org/release/%RELVERSION%/%MODEL%-%RELVERSION%-%LANGUAGE%.zip |
| 26 | font_url=https://download.rockbox.org/release/%RELEASEVER%/rockbox-fonts-%RELEASEVER%.zip | 26 | font_url=https://download.rockbox.org/release/%RELVERSION%/rockbox-fonts-%RELVERSION%.zip |
| 27 | manual_url=https://download.rockbox.org/release/%RELEASEVER%/rockbox-%MODEL%%FORMAT% | 27 | manual_url=https://download.rockbox.org/release/%RELVERSION%/rockbox-%MODEL%%FORMAT% |
| 28 | 28 | ||
| 29 | [release-candidate] | 29 | [release-candidate] |
| 30 | build_url=https://download.rockbox.org/release-candidate/%RELVERSION%/rockbox-%MODEL%-%RELVERSION%.zip | 30 | build_url=https://download.rockbox.org/release-candidate/%RELVERSION%/rockbox-%MODEL%-%RELVERSION%.zip |
| 31 | voice_url=https://download.rockbox.org/release-candidate/%RELVERSION%/%MODEL%-%RELVERSION%-english.zip | 31 | voice_url=https://download.rockbox.org/release-candidate/%RELVERSION%/%MODEL%-%RELVERSION%-english.zip |
| 32 | font_url=https://download.rockbox.org/release-candidate/%RELEASEVER%/rockbox-fonts-%RELEASEVER%.zip | 32 | font_url=https://download.rockbox.org/release-candidate/%RELVERSION%/rockbox-fonts-%RELVERSION%.zip |
| 33 | manual_url=https://download.rockbox.org/release-candidate/%RELEASEVER%/rockbox-%MODEL%%FORMAT% | 33 | manual_url=https://download.rockbox.org/release-candidate/%RELVERSION%/rockbox-%MODEL%%FORMAT% |
| 34 | 34 | ||
| 35 | [development] | 35 | [development] |
| 36 | build_url=http://build.rockbox.org/data/rockbox-%MODEL%.zip | 36 | build_url=http://build.rockbox.org/data/rockbox-%MODEL%.zip |