diff options
Diffstat (limited to 'bin/update/create_full_mar.py')
-rwxr-xr-x | bin/update/create_full_mar.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/bin/update/create_full_mar.py b/bin/update/create_full_mar.py index 02870b35a63c..2362f2c9850d 100755 --- a/bin/update/create_full_mar.py +++ b/bin/update/create_full_mar.py @@ -6,6 +6,7 @@ import subprocess import json from tools import uncompress_file_to_dir, get_file_info +from config import parse_config current_dir_path = os.path.dirname(os.path.realpath(__file__)) @@ -15,19 +16,19 @@ def make_mar_name(target_dir, filename_prefix): def main(): print(sys.argv) - if len(sys.argv) < 9: - print("Usage: create_full_mar_for_languages.py $PRODUCTNAME $WORKDIR $TARGETDIR $TEMPDIR $FILENAMEPREFIX $BASE_URL") + if len(sys.argv) < 7: + print("Usage: create_full_mar_for_languages.py $PRODUCTNAME $WORKDIR $TARGETDIR $TEMPDIR $FILENAMEPREFIX $UPDATE_CONFIG") sys.exit(1) - url = sys.argv[8] - certificate_path = sys.argv[7] - certificate_name = sys.argv[6] + update_config = sys.argv[6] filename_prefix = sys.argv[5] temp_dir = sys.argv[4] target_dir = sys.argv[3] workdir = sys.argv[2] product_name = sys.argv[1] + config = parse_config(update_config) + tar_dir = os.path.join(workdir, "installation", product_name, "archive", "install", "en-US") tar_file = os.path.join(tar_dir, os.listdir(tar_dir)[0]) @@ -42,11 +43,11 @@ def main(): subprocess.call([os.path.join(current_dir_path, 'make_full_update.sh'), mar_file, uncompress_dir]) signed_mar_file = make_mar_name(target_dir, filename_prefix + '_signed') - subprocess.call([mar_executable, '-C', target_dir, '-d', certificate_path, '-n', certificate_name, '-s', mar_file, signed_mar_file]) + subprocess.call([mar_executable, '-C', target_dir, '-d', config.certificate_path, '-n', config.certificate_name, '-s', mar_file, signed_mar_file]) os.rename(signed_mar_file, mar_file) - file_info = { 'complete' : get_file_info(mar_file, url) } + file_info = { 'complete' : get_file_info(mar_file, config.base_url) } with open(os.path.join(target_dir, 'complete_info.json'), "w") as complete_info_file: json.dump(file_info, complete_info_file, indent = 4) |