From e4fb77d2917d9cb212e24a621140060d9488efdc Mon Sep 17 00:00:00 2001 From: Minijackson Date: Thu, 30 Nov 2023 13:51:31 +0100 Subject: [PATCH] ioc/outputs: fix copying of apps and iocBoot folders previously, if the target directory existed, EPNix copied apps and iocBoot folders in the wrong place --- ioc/modules/outputs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ioc/modules/outputs.nix b/ioc/modules/outputs.nix index b84b7878..34865ca6 100644 --- a/ioc/modules/outputs.nix +++ b/ioc/modules/outputs.nix @@ -51,7 +51,7 @@ in { '' echo "Copying apps..." ${concatMapStringsSep "\n" (app: '' - cp -rfv "${app}" "$sourceRoot/${epnix.lib.getName app}" + cp -rTfv "${app}" "$sourceRoot/${epnix.lib.getName app}" '') config.epnix.applications.resolvedApps} @@ -59,7 +59,7 @@ in { echo "Copying additional iocBoot directories..." ${concatMapStringsSep "\n" (boot: '' - cp -rfv "${boot}" "$sourceRoot/iocBoot/${epnix.lib.getName boot}" + cp -rTfv "${boot}" "$sourceRoot/iocBoot/${epnix.lib.getName boot}" '') config.epnix.boot.resolvedIocBoots} @@ -72,7 +72,7 @@ in { postInstall = '' if [[ -d iocBoot ]]; then - cp -rafv iocBoot "$out" + cp -rafv iocBoot -t "$out" fi ''