From b4b41c87af64608e6cd1e6378acfabd31fb28fed Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 15 Dec 2021 21:18:25 +0100 Subject: [PATCH] build: Quote bash variables --- default.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/default.nix b/default.nix index 559959a..6853aa4 100644 --- a/default.nix +++ b/default.nix @@ -29,7 +29,7 @@ let cd sources printf "%s-%s" "$revCount" "$shortRev" > version - xmllint --xinclude --output $out ./book.xml + xmllint --xinclude --output "$out" ./book.xml ''; toc = builtins.toFile "toc.xml" @@ -53,7 +53,7 @@ let "--param chunk.first.sections 1" "--param use.id.as.filename 1" "--stringparam generate.toc 'book toc appendix toc'" - "--stringparam chunk.toc ${toc}" + "--stringparam chunk.toc '${toc}'" ]; in pkgs.stdenv.mkDerivation { @@ -65,20 +65,20 @@ in pkgs.stdenv.mkDerivation { installPhase = '' # Generate the HTML manual. dst=$out/share/doc/nix-pills - mkdir -p $dst + mkdir -p "$dst" xsltproc \ ${manualXsltprocOptions} \ - --nonet --output $dst/ \ - ${pkgs.docbook-xsl-ns}/xml/xsl/docbook/xhtml/chunk.xsl \ - ${combined} + --nonet --output "$dst/" \ + "${pkgs.docbook-xsl-ns}/xml/xsl/docbook/xhtml/chunk.xsl" \ + "${combined}" - mkdir -p $dst/images - cp -r ${pkgs.docbook-xsl-ns}/xml/xsl/docbook/images/callouts $dst/images/callouts + mkdir -p "$dst/images" + cp -r "${pkgs.docbook-xsl-ns}/xml/xsl/docbook/images/callouts" "$dst/images/callouts" - cp ${./style.css} $dst/style.css + cp "${./style.css}" "$dst/style.css" - mkdir -p $out/nix-support - echo "nix-build out $out" >> $out/nix-support/hydra-build-products - echo "doc nix-pills $dst" >> $out/nix-support/hydra-build-products + mkdir -p "$out/nix-support" + echo "nix-build out $out" >> "$out/nix-support/hydra-build-products" + echo "doc nix-pills $dst" >> "$out/nix-support/hydra-build-products" ''; }