From ba93cfa0bf90b56805922f58e2aef85d3ae9769f Mon Sep 17 00:00:00 2001 From: RonTamG <33351836+RonTamG@users.noreply.github.com> Date: Mon, 12 Feb 2024 16:52:05 +0000 Subject: [PATCH] feat: changed name of inner folder of output tar to be name of tar instead of temp folder name --- main.py | 10 ++++++---- tests/acceptance_tests/install_git.sh | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/main.py b/main.py index 7bd0c03..70e45b5 100644 --- a/main.py +++ b/main.py @@ -36,9 +36,11 @@ def set_permissions(tarinfo): tarinfo.mode = 0o755 return tarinfo - with tarfile.open(name, "w:gz") as tar: - tar.add(Path(path, "packages")) - tar.add(Path(path, "install.sh"), filter=set_permissions) + with tarfile.open(name + ".tar.gz", "w:gz") as tar: + tar.add(Path(path, "packages"), Path(name, "packages")) + tar.add( + Path(path, "install.sh"), Path(name, "install.sh"), filter=set_permissions + ) def apt_update(sources_list_path, enable_progress_bar=True): @@ -187,7 +189,7 @@ def main(): generate_packages_index_file(packages, temp_folder) write_install_script(name, temp_folder) index_dump_path.unlink(missing_ok=True) - tar_dir(temp_folder, f"{name}.tar.gz") + tar_dir(temp_folder, name) if not args.keep: shutil.rmtree(temp_folder) diff --git a/tests/acceptance_tests/install_git.sh b/tests/acceptance_tests/install_git.sh index 51c8ade..eaf3e3b 100644 --- a/tests/acceptance_tests/install_git.sh +++ b/tests/acceptance_tests/install_git.sh @@ -16,7 +16,7 @@ python main.py --sources-list /etc/apt/sources.list $remove_progress_bar git tar -xvf git.tar.gz # run the install script -cd temp_apt +cd git ./install.sh -y