diff options
| author | cfhammill <cfhammill@gmail.com> | 2020-07-13 17:20:14 -0400 |
|---|---|---|
| committer | cfhammill <cfhammill@gmail.com> | 2020-07-13 17:20:14 -0400 |
| commit | 8975b7b0e2f7b02af03175ca4552f74c668b77ca (patch) | |
| tree | 1c1681dd1c3cf37b35666509e2e37af9db343e14 /pkgs/build-support/singularity-tools/default.nix | |
| parent | 26291ccf3412d3241a4ec712d847d85c52085a53 (diff) | |
| download | nixpkgs-8975b7b0e2f7b02af03175ca4552f74c668b77ca.tar nixpkgs-8975b7b0e2f7b02af03175ca4552f74c668b77ca.tar.gz nixpkgs-8975b7b0e2f7b02af03175ca4552f74c668b77ca.tar.bz2 nixpkgs-8975b7b0e2f7b02af03175ca4552f74c668b77ca.tar.lz nixpkgs-8975b7b0e2f7b02af03175ca4552f74c668b77ca.tar.xz nixpkgs-8975b7b0e2f7b02af03175ca4552f74c668b77ca.tar.zst nixpkgs-8975b7b0e2f7b02af03175ca4552f74c668b77ca.zip | |
singularity-tools: Check for /bin/sh existence before symlink
Fixes the case where the user has bashInteractive in the container contents
Diffstat (limited to 'pkgs/build-support/singularity-tools/default.nix')
| -rw-r--r-- | pkgs/build-support/singularity-tools/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/build-support/singularity-tools/default.nix b/pkgs/build-support/singularity-tools/default.nix index 54749e416ea..cf234abb55f 100644 --- 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 |