public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #60877 from veprbl/pr/nuke-refs-quotemeta-fix 

nukeReferences: fix for store paths with special characters
This commit is contained in:
Dmitry Kalinkin 2019-05-23 17:07:18 -04:00 committed by GitHub
parent aae4c114a4 fdada4a45f
commit 44f05df20b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/nuke-references/builder.sh
View File

@ -7,7 +7,7 @@ cat > $out/bin/nuke-refs <<EOF
excludes="" excludes=""
while getopts e: o; do while getopts e: o; do
case "\$o" in case "\$o" in
e) storeId=\$(echo "\$OPTARG" | sed -n "s|^$NIX_STORE/\\([a-z0-9]\{32\}\\)-.*|\1|p") e) storeId=\$(echo "\$OPTARG" | $perl/bin/perl -ne "print \"\\\$1\" if m|^\Q$NIX_STORE\E/([a-z0-9]{32})-.*|")
if [ -z "\$storeId" ]; then if [ -z "\$storeId" ]; then
echo "-e argument must be a Nix store path" echo "-e argument must be a Nix store path"
exit 1 exit 1
@ -20,7 +20,7 @@ shift \$((\$OPTIND-1))
for i in "\$@"; do for i in "\$@"; do
if test ! -L "\$i" -a -f "\$i"; then if test ! -L "\$i" -a -f "\$i"; then
cat "\$i" | $perl/bin/perl -pe "s|$NIX_STORE/\$excludes[a-z0-9]{32}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" > "\$i.tmp" cat "\$i" | $perl/bin/perl -pe "s|\Q$NIX_STORE\E/\$excludes[a-z0-9]{32}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" > "\$i.tmp"
if test -x "\$i"; then chmod +x "\$i.tmp"; fi if test -x "\$i"; then chmod +x "\$i.tmp"; fi
mv "\$i.tmp" "\$i" mv "\$i.tmp" "\$i"
fi fi