Merge pull request #93082 from cfhammill/cfh/fix-singularity-shell-copy

singularity-tools: Check for /bin/sh existence before symlink
2020-09-19 00:42:29 -03:00 · 2020-09-19 00:42:29 -03:00 · 6740a5998b
parent 2a35f66439 8975b7b0e2
commit 6740a5998b
1 changed files with 3 additions and 1 deletions
--- a/pkgs/build-support/singularity-tools/default.nix
+++ b/pkgs/build-support/singularity-tools/default.nix
@ -86,7 +86,9 @@ rec {
            done

            # Create runScript and link shell
-            ln -s ${runtimeShell} bin/sh
+            if [ ! -e bin/sh ]; then
+              ln -s ${runtimeShell} bin/sh
+            fi
            mkdir -p .singularity.d
            ln -s ${runScriptFile} .singularity.d/runscript