=== modified file 'zsh-functions/confz_containers_init' --- old/zsh-functions/confz_containers_init 2022-06-22 22:07:10 +0000 +++ new/zsh-functions/confz_containers_init 2022-06-22 22:01:46 +0000 @@ -445,17 +445,15 @@ checkvars containers_dir url checksum checksum_algo defvar filename ${vars[url]:t} - local download_dir=$vars[containers_dir]/download-cache - require fs_d filename=$download_dir + require fs_d filename=$vars[containers_dir]/download-cache do_command=( - $commands[cd] $download_dir wget --no-clobber --unlink - -o $download_dir/$vars[filename] + -o $vars[containers_dir]/download-cache/$vars[filename] -- $vars[url] ) - (cd $download_dir && + (cd $vars[containers_dir]/download-cache && $vars[checksum_algo]sum -c <<<"$vars[checksum] $vars[filename]") } @@ -936,11 +934,10 @@ 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 "$download_dir/$vars[filename]" + tar -xpC "$root" -f "$vars[filename]" ) [[ -f $root/install ]]