mrrl-containers

commit fbd0c67035b83cb6339369b64ca8cc5000e6146f
parent 9529bd4fe19b14e6b616138ec7806e34e99924ef
Author: Jan Pobříslo <ccx@te2000.cz>
Date:   Thu, 23 Jun 2022 00:07:10 +0200

unpack from correct location
Diffstat:
M
zsh-functions/confz_containers_init
 | 
11
+++++++----

1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/zsh-functions/confz_containers_init b/zsh-functions/confz_containers_init
@@ -445,15 +445,17 @@ confz_container_download_and_verify_check() {
 	checkvars containers_dir url checksum checksum_algo
 	defvar filename ${vars[url]:t}
 
-	require fs_d filename=$vars[containers_dir]/download-cache
+	local download_dir=$vars[containers_dir]/download-cache
+	require fs_d filename=$download_dir
 
 	do_command=(
+		$commands[cd] $download_dir
 		wget --no-clobber --unlink
-		-o $vars[containers_dir]/download-cache/$vars[filename]
+		-o $download_dir/$vars[filename]
 		--
 		$vars[url]
 	)
-	(cd $vars[containers_dir]/download-cache &&
+	(cd $download_dir &&
 		$vars[checksum_algo]sum -c <<<"$vars[checksum]  $vars[filename]")
 }
 
@@ -934,10 +936,11 @@ confz_container_nix_image_from_release_check() {
 confz_container_nix_unpacked_check() {
 	checkvars containers_dir image_name filename
 	local root=$vars[containers_dir]/systems/$vars[image_name]
+	local download_dir=$vars[containers_dir]/download-cache
 
 	do_command=(
 		s6-setuidgid container-$vars[image_name]
-		tar -xpC "$root" -f "$vars[filename]"
+		tar -xpC "$root" -f "$download_dir/$vars[filename]"
 	)
 
 	[[ -f $root/install ]]