dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

singularity-tools: quote shell variables

Browse Source
This commit is contained in:
Yueh-Shun Li 2024-08-11 11:06:00 +08:00
parent 4be1e115d6
commit 7487a6207d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/build-support/singularity-tools/default.nix
View File

@ -116,14 +116,14 @@ lib.makeExtensible (final: {
# Build /bin and copy across closure
mkdir -p bin ./${builtins.storeDir}
for f in $(cat $layerClosure) ; do
cp -ar $f ./$f
for f in $(cat "$layerClosure") ; do
cp -ar "$f" "./$f"
done
for c in ${toString contents} ; do
for f in $c/bin/* ; do
if [ ! -e bin/$(basename $f) ] ; then
ln -s $f bin/
for f in "$c"/bin/* ; do
if [ ! -e "bin/$(basename "$f")" ] ; then
ln -s "$f" bin/
fi
done
done
@ -143,7 +143,7 @@ lib.makeExtensible (final: {
mkdir -p /var/lib/${projectName}/mnt/session
echo "root:x:0:0:System administrator:/root:/bin/sh" > /etc/passwd
echo > /etc/resolv.conf
TMPDIR=$(pwd -P) ${projectName} build $out ./img
TMPDIR="$(pwd -P)" ${projectName} build "$out" ./img
''
);