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

multiple-outputs.sh: remove grep from combined conditional

Browse Source
This commit is contained in:
happysalada 2021-06-29 11:20:58 +09:00 committed by Raphael Megzari
parent 6d52db43d4
commit 44819162e8
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/build-support/setup-hooks/multiple-outputs.sh
View File

@ -48,22 +48,25 @@ _overrideFirst outputInfo "info" "$outputBin"
# Add standard flags to put files into the desired outputs.
_multioutConfig() {
if [ "$outputs" = "out" ] || [ -z "${setOutputFlags-1}" ]; then return; fi;
if [[ "$outputs" = "out" || -z "${setOutputFlags-1}" ]]; then
return
fi
# try to detect share/doc/${shareDocName}
# Note: sadly, $configureScript detection comes later in configurePhase,
# and reordering would cause more trouble than worth.
if [ -z "$shareDocName" ]; then
local confScript="$configureScript"
if [ -z "$confScript" ] && [ -x ./configure ]; then
if [[ -z "$confScript" && -x ./configure ]]; then
confScript=./configure
fi
if [ -f "$confScript" ]; then
local shareDocName="$(sed -n "s/^PACKAGE_TARNAME='\(.*\)'$/\1/p" < "$confScript")"
fi
# PACKAGE_TARNAME sometimes contains garbage.
if [ -z "$shareDocName" ] || echo "$shareDocName" | grep -q '[^a-zA-Z0-9_-]'; then
shareDocName="$(echo "$name" | sed 's/-[^a-zA-Z].*//')"
# PACKAGE_TARNAME sometimes contains garbage.
# verify that shareDocName contains only valid characters
if ! [[ $shareDocName =~ ^[a-zA-Z0f9_-]+$ ]]; then
shareDocName="$(echo "$name" | sed 's/-[^a-zA-Z].*//')"
fi
fi
fi