From 75ae5215364a9312805a4e2dea10547fd17260e1 Mon Sep 17 00:00:00 2001 From: Reshetnikov_AS Date: Fri, 1 Mar 2024 23:25:57 +0400 Subject: [PATCH] =?UTF-8?q?+=20=E2=86=92=20\;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _AutoinstallCreator/test_update.py | 3 ++- update.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/_AutoinstallCreator/test_update.py b/_AutoinstallCreator/test_update.py index 6ddb22dc..d1593bc0 100644 --- a/_AutoinstallCreator/test_update.py +++ b/_AutoinstallCreator/test_update.py @@ -69,8 +69,9 @@ def test_version_up_to_date(self): cwd=_self_tmp_path, check=True) - subprocess.run(busybox_exe_path_arg + [os.path.join(_self_tmp_path, self.version_str, 'update.sh')], + subprocess.run([os.path.join(_self_tmp_path, self.version_str, update_script_name)], env={ + **os.environ, 'MOCK_AUTOINSTALLCREATOR_VERSION_BODY': self.version_str, 'MOCK_AUTOINSTALLCREATOR_PACKAGE_FILEPATH': self.package_filepath }, diff --git a/update.sh b/update.sh index eee33d6d..21852fac 100755 --- a/update.sh +++ b/update.sh @@ -29,7 +29,7 @@ if [[ ! -z "$target_path" ]]; then echo "Copying new files" find "$dp0" -mindepth 1 -maxdepth 1 ! -name "tmp_*" \ - -exec cp -rf "{}" "$target_path/" + + -exec cp -rf "{}" "$target_path/" \; echo "Removing orphaned files" orphaned_files=$(cat $dp0/_$self_name/orphaned_files.txt)