diff --git a/python_modules/build_iso.py b/python_modules/build_iso.py index d08498c0..8fd04fb7 100644 --- a/python_modules/build_iso.py +++ b/python_modules/build_iso.py @@ -87,12 +87,9 @@ class BuildXfce: current_working_directory ) print('=' * term_size.columns) - bld_list = collections.deque(conf.shared_finish_build) - list_size = len(bld_list) - for _ in range(list_size): - i = bld_list.popleft() - execute = i + '()' - exec(execute) + finish_cleanup.make_check_sum() + finish_cleanup.copy_iso_file_nightly_deb64() + finish_cleanup.kill_old_iso() print('=' * term_size.columns) print("INFO: ISO is ready for usage.") print('=' * term_size.columns) @@ -145,12 +142,9 @@ class BuildXfce: current_working_directory ) print('=' * term_size.columns) - bld_list = collections.deque(conf.shared_finish_build) - list_size = len(bld_list) - for _ in range(list_size): - i = bld_list.popleft() - execute = i + '()' - exec(execute) + finish_cleanup.make_check_sum() + finish_cleanup.copy_iso_file_nightly_deb32() + finish_cleanup.kill_old_iso() print('=' * term_size.columns) print("INFO: ISO is ready for usage.") print('=' * term_size.columns) @@ -203,12 +197,9 @@ class BuildXfce: current_working_directory ) print('=' * term_size.columns) - bld_list = collections.deque(conf.shared_finish_build) - list_size = len(bld_list) - for _ in range(list_size): - i = bld_list.popleft() - execute = i + '()' - exec(execute) + finish_cleanup.make_check_sum() + finish_cleanup.copy_iso_file_nightly_debarm() + finish_cleanup.kill_old_iso() print('=' * term_size.columns) print("INFO: ISO is ready for usage.") print('=' * term_size.columns) @@ -275,12 +266,10 @@ class BuildXfce: current_working_directory ) print('=' * term_size.columns) - bld_list = collections.deque(conf.shared_finish_build) - list_size = len(bld_list) - for _ in range(list_size): - i = bld_list.popleft() - execute = i + '()' - exec(execute) + finish_cleanup.make_check_sum() + finish_cleanup.copy_iso_file_nightly_dev64() + finish_cleanup.kill_old_iso() + #'finish_cleanup.copy_iso_file_prod_deb64', print('=' * term_size.columns) print("INFO: ISO is ready for usage.") print('=' * term_size.columns) @@ -333,12 +322,9 @@ class BuildXfce: current_working_directory ) print('=' * term_size.columns) - bld_list = collections.deque(conf.shared_finish_build) - list_size = len(bld_list) - for _ in range(list_size): - i = bld_list.popleft() - execute = i + '()' - exec(execute) + finish_cleanup.make_check_sum() + finish_cleanup.copy_iso_file_nightly_dev32() + finish_cleanup.kill_old_iso() print('=' * term_size.columns) print("INFO: ISO is ready for usage.") print('=' * term_size.columns) @@ -391,12 +377,9 @@ class BuildXfce: current_working_directory ) print('=' * term_size.columns) - bld_list = collections.deque(conf.shared_finish_build) - list_size = len(bld_list) - for _ in range(list_size): - i = bld_list.popleft() - execute = i + '()' - exec(execute) + finish_cleanup.make_check_sum() + finish_cleanup.copy_iso_file_nightly_devarm() + finish_cleanup.kill_old_iso() print('=' * term_size.columns) print("INFO: ISO is ready for usage.") print('=' * term_size.columns) diff --git a/python_modules/conf.py b/python_modules/conf.py index e9a2c46f..bd60e912 100644 --- a/python_modules/conf.py +++ b/python_modules/conf.py @@ -61,14 +61,6 @@ buildarm_xfce_build = (shared_setup_cmds + setup_xfce_cmds + setup_fw_arm ) -## These run the actual build process. -shared_finish_build = ('finish_cleanup.make_check_sum', - 'finish_cleanup.copy_iso_file_nightly_deb64', - 'finish_cleanup.copy_iso_file_prod_deb64', - 'finish_cleanup.kill_old_iso' - ) - - ### Inflate bubble section