diff options
| author | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-01-05 16:48:08 +0100 |
|---|---|---|
| committer | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-01-06 00:15:00 +0100 |
| commit | 958089803917f46c81ca818b791c846c072f6fca (patch) | |
| tree | 7b9ebec4387ce4c6fe4df8058c01746a55c1253a /bin | |
| parent | 545851e8afb426c92b2af5f57a18937b67f0d959 (diff) | |
Fix `make create-update-info` also for non-Windows
Change-Id: I83a44d0cb563b1caf9459dddec7c6409af6ac0f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161693
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
(cherry picked from commit 014ff7579fd3e57412d6ea5905164b8e8c535868)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161682
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/update/create_full_mar_for_languages.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/bin/update/create_full_mar_for_languages.py b/bin/update/create_full_mar_for_languages.py index 37d52e77b3ac..d431ecaf6d1a 100755 --- a/bin/update/create_full_mar_for_languages.py +++ b/bin/update/create_full_mar_for_languages.py @@ -10,8 +10,6 @@ from tools import uncompress_file_to_dir, get_file_info from path import UpdaterPath from signing import sign_mar_file -current_dir_path = os.path.dirname(os.path.realpath(__file__)) - def make_complete_mar_name(target_dir, filename_prefix, language): filename = filename_prefix + "_" + language + "_complete_langpack.mar" @@ -26,9 +24,9 @@ def create_lang_infos(mar_file_name, language, url): def main(): - if len(sys.argv) < 7: + if len(sys.argv) < 8: print( - "Usage: create_full_mar_for_languages.py $PRODUCTNAME $WORKDIR $TARGETDIR $TEMPDIR $FILENAMEPREFIX $CERTIFICATEPATH $CERTIFICATENAME $BASEURL") + "Usage: create_full_mar_for_languages.py $PRODUCTNAME $WORKDIR $TARGETDIR $TEMPDIR $FILENAMEPREFIX $CERTIFICATEPATH $CERTIFICATENAME $BASEURL $VERSION") sys.exit(1) certificate_path = sys.argv[4] @@ -37,6 +35,7 @@ def main(): filename_prefix = sys.argv[3] workdir = sys.argv[2] product_name = sys.argv[1] + version = sys.argv[7] updater_path = UpdaterPath(workdir) target_dir = updater_path.get_update_dir() @@ -56,7 +55,9 @@ def main(): mar_file_name = make_complete_mar_name(target_dir, filename_prefix, language) - subprocess.call([os.path.join(current_dir_path, 'make_full_update.sh'), mar_file_name, directory]) + os.putenv('MOZ_PRODUCT_VERSION', version) + os.putenv('MAR_CHANNEL_ID', 'LOOnlineUpdater') + subprocess.call([os.path.join(workdir, 'UnpackedTarball/onlineupdate/tools/update-packaging/make_full_update.sh'), mar_file_name, directory]) sign_mar_file(target_dir, certificate_path, certificate_name, mar_file_name, filename_prefix) |