Merge pull request #45911 from samueldr/fix/nixos-help-browser

nixos/manual: nixos-help knows about colon-separated BROWSER

authored by

Graham Christensen and committed by
GitHub
146f8bac f14b6cb6

+7 -1
+7 -1
nixos/modules/services/misc/nixos-manual.nix
··· 44 helpScript = pkgs.writeScriptBin "nixos-help" 45 '' 46 #! ${pkgs.runtimeShell} -e 47 - browser="$BROWSER" 48 if [ -z "$browser" ]; then 49 browser="$(type -P xdg-open || true)" 50 if [ -z "$browser" ]; then
··· 44 helpScript = pkgs.writeScriptBin "nixos-help" 45 '' 46 #! ${pkgs.runtimeShell} -e 47 + # Finds first executable browser in a colon-separated list. 48 + # (see how xdg-open defines BROWSER) 49 + browser="$( 50 + IFS=: ; for b in $BROWSER; do 51 + [ -n "$(type -P "$b" || true)" ] && echo "$b" && break 52 + done 53 + )" 54 if [ -z "$browser" ]; then 55 browser="$(type -P xdg-open || true)" 56 if [ -z "$browser" ]; then