commit 28fa4a2f03e2232d95dec9dc2b8ef40857d725db · pyrox.dev/nixpkgs

+10 -1

lib/strings.nix

···

       213
        
              escapeShellArg "so([<>])me"

     

       214
        
              => "so\\(\\[\\<\\>\\]\\)me"

     

       215
        
         */

     

       216
       -
         escapeShellArg = lib.escape (stringToCharacters "\\ ';$`()|<>\t*[]");

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       217
        
       

     

       218
        
         /* Obsolete - use replaceStrings instead. */

     

       219
        
         replaceChars = builtins.replaceStrings or (

···

       213
        
              escapeShellArg "so([<>])me"

     

       214
        
              => "so\\(\\[\\<\\>\\]\\)me"

     

       215
        
         */

     

       216
       +
         escapeShellArg = arg:

     

       217
       +
           lib.escape (stringToCharacters "\\ ';$`()|<>\t*[]") (toString arg);

     

       218
       +
       

     

       219
       +
         /* Escape all arguments to be passed to the Bourne shell.

     

       220
       +
       

     

       221
       +
            Example:

     

       222
       +
              escapeShellArgs ["one" "two three"]

     

       223
       +
              => "one two\\ three"

     

       224
       +
         */

     

       225
       +
         escapeShellArgs = concatMapStringsSep " " escapeShellArg;

     

       226
        
       

     

       227
        
         /* Obsolete - use replaceStrings instead. */

     

       228
        
         replaceChars = builtins.replaceStrings or (

+1 -1

nixos/modules/security/acme.nix

···

       187
        
                         script = ''

     

       188
        
                           cd '${cpath}'

     

       189
        
                           set +e

     

       190
       -
                           simp_le ${concatMapStringsSep " " (arg: escapeShellArg (toString arg)) cmdline}

     

       191
        
                           EXITCODE=$?

     

       192
        
                           set -e

     

       193
        
                           echo "$EXITCODE" > /tmp/lastExitCode

···

       187
        
                         script = ''

     

       188
        
                           cd '${cpath}'

     

       189
        
                           set +e

     

       190
       +
                           simp_le ${escapeShellArgs cmdline}

     

       191
        
                           EXITCODE=$?

     

       192
        
                           set -e

     

       193
        
                           echo "$EXITCODE" > /tmp/lastExitCode

+1 -1

nixos/modules/services/mail/opendkim.nix

···

       101
        
             wantedBy = [ "multi-user.target" ];

     

       102
        
       

     

       103
        
             serviceConfig = {

     

       104
       -
               ExecStart = "${pkgs.opendkim}/bin/opendkim ${concatMapStringsSep " " escapeShellArg args}";

     

       105
        
               User = cfg.user;

     

       106
        
               Group = cfg.group;

     

       107
        
               RuntimeDirectory = optional (cfg.socket == defaultSock) "opendkim";

···

       101
        
             wantedBy = [ "multi-user.target" ];

     

       102
        
       

     

       103
        
             serviceConfig = {

     

       104
       +
               ExecStart = "${pkgs.opendkim}/bin/opendkim ${escapeShellArgs args}";

     

       105
        
               User = cfg.user;

     

       106
        
               Group = cfg.group;

     

       107
        
               RuntimeDirectory = optional (cfg.socket == defaultSock) "opendkim";

-2

nixos/modules/services/misc/taskserver/default.nix

···

       152
        
           };

     

       153
        
         };

     

       154
        
       

     

       155
       -
         mkShellStr = val: "'${replaceStrings ["'"] ["'\\''"] val}'";

     

       156
       -
       

     

       157
        
         certtool = "${pkgs.gnutls.bin}/bin/certtool";

     

       158
        
       

     

       159
        
         nixos-taskserver = pkgs.buildPythonPackage {

···

       152
        
           };

     

       153
        
         };

     

       154
        
       

     

       0
        
       
     

       0
        
       
     

       155
        
         certtool = "${pkgs.gnutls.bin}/bin/certtool";

     

       156
        
       

     

       157
        
         nixos-taskserver = pkgs.buildPythonPackage {

+1 -1

nixos/modules/services/networking/ejabberd.nix

···

       13
        
       

     

       14
        
         ectl = ''${cfg.package}/bin/ejabberdctl ${if cfg.configFile == null then "" else "--config ${cfg.configFile}"} --ctl-config "${ctlcfg}" --spool "${cfg.spoolDir}" --logs "${cfg.logsDir}"'';

     

       15
        
       

     

       16
       -
         dumps = lib.concatMapStringsSep " " lib.escapeShellArg cfg.loadDumps;

     

       17
        
       

     

       18
        
       in {

     

       19

···

       13
        
       

     

       14
        
         ectl = ''${cfg.package}/bin/ejabberdctl ${if cfg.configFile == null then "" else "--config ${cfg.configFile}"} --ctl-config "${ctlcfg}" --spool "${cfg.spoolDir}" --logs "${cfg.logsDir}"'';

     

       15
        
       

     

       16
       +
         dumps = lib.escapeShellArgs cfg.loadDumps;

     

       17
        
       

     

       18
        
       in {

     

       19

+1 -3

pkgs/build-support/vm/windows/controller/default.nix

···

       71
        
           };

     

       72
        
         };

     

       73
        
       

     

       74
       -
         shellEscape = x: "'${replaceChars ["'"] [("'\\'" + "'")] x}'";

     

       75
       -
       

     

       76
        
         loopForever = "while :; do ${coreutils}/bin/sleep 1; done";

     

       77
        
       

     

       78
        
         initScript = writeScript "init.sh" (''

     
···

       132
        
             -o StrictHostKeyChecking=no \

     

       133
        
             -i /ssh.key \

     

       134
        
             -l Administrator \

     

       135
       -
             192.168.0.1 -- ${shellEscape command}

     

       136
        
         '') + optionalString (suspendTo != null) ''

     

       137
        
           ${coreutils}/bin/touch /xchg/suspend_now

     

       138
        
           ${loopForever}

···

       71
        
           };

     

       72
        
         };

     

       73
        
       

     

       0
        
       
     

       0
        
       
     

       74
        
         loopForever = "while :; do ${coreutils}/bin/sleep 1; done";

     

       75
        
       

     

       76
        
         initScript = writeScript "init.sh" (''

     
···

       130
        
             -o StrictHostKeyChecking=no \

     

       131
        
             -i /ssh.key \

     

       132
        
             -l Administrator \

     

       133
       +
             192.168.0.1 -- ${lib.escapeShellArg command}

     

       134
        
         '') + optionalString (suspendTo != null) ''

     

       135
        
           ${coreutils}/bin/touch /xchg/suspend_now

     

       136
        
           ${loopForever}

+2 -4

pkgs/development/ruby-modules/bundler-env/default.nix

···

       16
        
       }@args:

     

       17
        
       

     

       18
        
       let

     

       19
       -
       

     

       20
       -
         shellEscape = x: "'${lib.replaceChars ["'"] [("'\\'" + "'")] x}'";

     

       21
        
         importedGemset = import gemset;

     

       22
        
         filteredGemset = (lib.filterAttrs (name: attrs:

     

       23
        
           if (builtins.hasAttr "groups" attrs)

     
···

       58
        
               "${confFiles}/Gemfile" \

     

       59
        
               "$out/${ruby.gemPath}" \

     

       60
        
               "${bundler}/${ruby.gemPath}" \

     

       61
       -
               ${shellEscape (toString envPaths)} \

     

       62
       -
               ${shellEscape (toString groups)}

     

       63
        
           '' + lib.optionalString (postBuild != null) postBuild;

     

       64
        
           passthru = rec {

     

       65
        
             inherit ruby bundler meta gems;

···

       16
        
       }@args:

     

       17
        
       

     

       18
        
       let

     

       0
        
       
     

       0
        
       
     

       19
        
         importedGemset = import gemset;

     

       20
        
         filteredGemset = (lib.filterAttrs (name: attrs:

     

       21
        
           if (builtins.hasAttr "groups" attrs)

     
···

       56
        
               "${confFiles}/Gemfile" \

     

       57
        
               "$out/${ruby.gemPath}" \

     

       58
        
               "${bundler}/${ruby.gemPath}" \

     

       59
       +
               ${lib.escapeShellArg envPaths} \

     

       60
       +
               ${lib.escapeShellArg groups}

     

       61
        
           '' + lib.optionalString (postBuild != null) postBuild;

     

       62
        
           passthru = rec {

     

       63
        
             inherit ruby bundler meta gems;

+3 -4

pkgs/development/ruby-modules/gem/default.nix

···

       18
        
       # Normal gem packages can be used outside of bundler; a binstub is created in

     

       19
        
       # $out/bin.

     

       20
        
       

     

       21
       -
       { lib, ruby, bundler, fetchurl, fetchgit, makeWrapper, git,

     

       22
       -
         buildRubyGem, darwin

     

       23
        
       } @ defs:

     

       24
        
       

     

       25
        
       lib.makeOverridable (

     
···

       53
        
       , ...} @ attrs:

     

       54
        
       

     

       55
        
       let

     

       56
       -
         shellEscape = x: "'${lib.replaceChars ["'"] [("'\\'" + "'")] x}'";

     

       57
        
         src = attrs.src or (

     

       58
        
           if type == "gem" then

     

       59
        
             fetchurl {

     
···

       165
        
             ${src} \

     

       166
        
             ${attrs.rev} \

     

       167
        
             ${version} \

     

       168
       -
             ${shellEscape (toString buildFlags)}

     

       169
        
           ''}

     

       170
        
       

     

       171
        
           ${lib.optionalString (type == "gem") ''

···

       18
        
       # Normal gem packages can be used outside of bundler; a binstub is created in

     

       19
        
       # $out/bin.

     

       20
        
       

     

       21
       +
       { lib, fetchurl, fetchgit, makeWrapper, git, darwin

     

       22
       +
       , ruby, bundler

     

       23
        
       } @ defs:

     

       24
        
       

     

       25
        
       lib.makeOverridable (

     
···

       53
        
       , ...} @ attrs:

     

       54
        
       

     

       55
        
       let

     

       0
        
       
     

       56
        
         src = attrs.src or (

     

       57
        
           if type == "gem" then

     

       58
        
             fetchurl {

     
···

       164
        
             ${src} \

     

       165
        
             ${attrs.rev} \

     

       166
        
             ${version} \

     

       167
       +
             ${lib.escapeShellArgs buildFlags}

     

       168
        
           ''}

     

       169
        
       

     

       170
        
           ${lib.optionalString (type == "gem") ''

+1 -2

pkgs/servers/x11/xquartz/default.nix

···

       37
        
       # that point into the user's profile.

     

       38
        
       

     

       39
        
       let

     

       40
       -
         shellEscape = x: "'${lib.replaceChars ["'"] [("'\\'" + "'")] x}'";

     

       41
        
         installer = writeScript "xquartz-install" ''

     

       42
        
           NIX_LINK=$HOME/.nix-profile

     

       43
        
       

     
···

       138
        
           defaultStartX="$out/bin/startx -- $out/bin/Xquartz"

     

       139
        
       

     

       140
        
           ruby ${./patch_plist.rb} \

     

       141
       -
             ${shellEscape (builtins.toXML {

     

       142
        
               XQUARTZ_DEFAULT_CLIENT = "${xterm}/bin/xterm";

     

       143
        
               XQUARTZ_DEFAULT_SHELL  = "${shell}";

     

       144
        
               XQUARTZ_DEFAULT_STARTX = "@STARTX@";

···

       37
        
       # that point into the user's profile.

     

       38
        
       

     

       39
        
       let

     

       0
        
       
     

       40
        
         installer = writeScript "xquartz-install" ''

     

       41
        
           NIX_LINK=$HOME/.nix-profile

     

       42
        
       

     
···

       137
        
           defaultStartX="$out/bin/startx -- $out/bin/Xquartz"

     

       138
        
       

     

       139
        
           ruby ${./patch_plist.rb} \

     

       140
       +
             ${lib.escapeShellArg (builtins.toXML {

     

       141
        
               XQUARTZ_DEFAULT_CLIENT = "${xterm}/bin/xterm";

     

       142
        
               XQUARTZ_DEFAULT_SHELL  = "${shell}";

     

       143
        
               XQUARTZ_DEFAULT_STARTX = "@STARTX@";