ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-20 03:59:30 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #255463 from emilylange/stdenv/patch-shebangs-trailing-newline

Browse Source 
patch-shebangs: fix crash with shebang without trailing newline
This commit is contained in:
Rick van Schijndel 2024-02-16 18:33:27 +01:00 committed by GitHub
commit b728d76d0e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/build-support/setup-hooks/patch-shebangs.sh
View File

@ -72,7 +72,10 @@ patchShebangs() {
while IFS= read -r -d $'\0' f; do
isScript "$f" || continue
read -r oldInterpreterLine < "$f"
# read exits unclean if the shebang does not end with a newline, but still assigns the variable.
# So if read returns errno != 0, we check if the assigned variable is non-empty and continue.
read -r oldInterpreterLine < "$f" || [ "$oldInterpreterLine" ]
read -r oldPath arg0 args <<< "${oldInterpreterLine:2}"
if [[ -z "${pathName:-}" ]]; then

17
pkgs/test/stdenv/patch-shebangs.nix
View File

@ -72,11 +72,26 @@ let
};
};
without-trailing-newline = stdenv.mkDerivation {
name = "without-trailing-newline";
strictDeps = false;
dontUnpack = true;
installPhase = ''
mkdir -p $out/bin
printf "#!/bin/bash" > $out/bin/test
chmod +x $out/bin/test
dontPatchShebangs=
'';
passthru = {
assertion = "grep '^#!${stdenv.shell}' $out/bin/test > /dev/null";
};
};
};
in
stdenv.mkDerivation {
name = "test-patch-shebangs";
passthru = { inherit (tests) bad-shebang ignores-nix-store updates-nix-store split-string; };
passthru = { inherit (tests) bad-shebang ignores-nix-store updates-nix-store split-string without-trailing-newline; };
buildCommand = ''
validate() {
local name=$1