From 6242ca41fe279334a0b2c873bc9093131848edc9 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 7 Sep 2026 14:46:22 +0200 Subject: [PATCH] don't create spreed integration test dirs when spreed doesn't exist fixes #43 --- nix/image/bootstrap | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/nix/image/bootstrap b/nix/image/bootstrap index 3d02506..4e7e0f3 100755 --- a/nix/image/bootstrap +++ b/nix/image/bootstrap @@ -23,26 +23,36 @@ shadow-setup echo $"Running as ($HAZE_UID):($HAZE_GID)" let dirs = [ - "/var/www/html/data" - "/var/www/html/config" - "/var/www/html/build/integration/vendor", - "/var/www/html/build/integration/output", - "/var/www/html/build/integration/work", - "/var/www/html/apps/spreed", - "/var/www/html/apps/spreed/tests", - "/var/www/html/apps/spreed/tests/integration", - "/var/www/html/apps/spreed/tests/integration/vendor", - "/var/www/html/apps/spreed/tests/integration/vendor/composer", + ["condition", "path"]; + ["/", "/var/www/html/data"], + ["/", "/var/www/html/config"], + ["/", "/var/www/html/build/integration/vendor"], + ["/", "/var/www/html/build/integration/output"], + ["/", "/var/www/html/build/integration/work"], + ["/var/www/html/apps/spreed", "/var/www/html/apps/spreed/tests/integration/vendor/composer"], ]; let files = [ - "/var/www/html/build/integration/composer.lock", + ["condition", "path"]; + ["/", "/var/www/html/build/integration/composer.lock"], ] -$dirs | each { |dir| mkdir $dir } -$files | each { |file| touch $file } +$dirs | each { |dir| + if ($dir.condition | path exists) { + mkdir $dir.path + } +} +$files | each { |file| + if ($file.condition | path exists) { + touch $file.path + } +} -$dirs | append $files | each { |path| chown -R $"($HAZE_UID):($HAZE_GID)" $path } +$dirs | append $files | each { |item| + if ($item.path | path exists) { + chown -R $"($HAZE_UID):($HAZE_GID)" $item.path + } +} echo "{}\n" | save -f /var/www/html/build/integration/composer.lock