Unverified Commit 31706d4a authored by Wolfgang Walther's avatar Wolfgang Walther
Browse files

treewide: fix sed -ie and friends 

GNU sed's man page has this to say about "-i":

  Because -i takes an optional argument, it should not be followed by
  other short options:
  [..]
  sed -iE '...' FILE
    This is equivalent to --in-place=E, creating FILEE as backup of FILE

This means all "-iX" did not have the intended effect X, so we can
instead remove them.
parent 597a7ad5

nixos/tests/prometheus-exporters.nix

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ let 
          succeed(

              'echo \'${postData}\'> /tmp/data.json'

          )

          succeed('sed -ie "s DATE $(date +%s) " /tmp/data.json')

          succeed('sed -i -e "s DATE $(date +%s) " /tmp/data.json')

          succeed(

              "curl -sSfH 'Content-Type: application/json' -X POST --data @/tmp/data.json localhost:9103/collectd"

          )

pkgs/applications/networking/p2p/gnunet/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -28,12 +28,12 @@ stdenv.mkDerivation rec { 
    # /etc/{resolv.conf,hosts}, replace all references to `localhost'

    # by their IPv4 equivalent.

    find . \( -name \*.c -or -name \*.conf \) | \

      xargs sed -ie 's|\<localhost\>|127.0.0.1|g'

      xargs sed -i -e 's|\<localhost\>|127.0.0.1|g'



    # Make sure the tests don't rely on `/tmp', for the sake of chroot

    # builds.

    find . \( -iname \*test\*.c -or -name \*.conf \) | \

      xargs sed -ie "s|/tmp|$TMPDIR|g"

      xargs sed -i -e "s|/tmp|$TMPDIR|g"

  '';



  # unfortunately, there's still a few failures with impure tests

pkgs/applications/terminal-emulators/mlterm/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -147,14 +147,14 @@ in stdenv.mkDerivation (finalAttrs: { 


  #bad configure.ac and Makefile.in everywhere

  preConfigure = ''

    sed -ie 's;-L/usr/local/lib -R/usr/local/lib;;g' \

    sed -i -e 's;-L/usr/local/lib -R/usr/local/lib;;g' \

      main/Makefile.in \

      tool/mlfc/Makefile.in \

      tool/mlimgloader/Makefile.in \

      tool/mlconfig/Makefile.in \

      uitoolkit/libtype/Makefile.in \

      uitoolkit/libotl/Makefile.in

    sed -ie 's;cd ..srcdir. && rm -f ...lang..gmo.*;;g' \

    sed -i -e 's;cd ..srcdir. && rm -f ...lang..gmo.*;;g' \

      tool/mlconfig/po/Makefile.in.in

    #utmp and mlterm-fb

    substituteInPlace configure.in \

pkgs/by-name/ar/arangodb/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ gcc10Stdenv.mkDerivation rec { 
  env.NIX_CFLAGS_COMPILE = "-Wno-error";



  postPatch = ''

    sed -ie 's!/bin/echo!echo!' 3rdParty/V8/gypfiles/*.gypi

    sed -i -e 's!/bin/echo!echo!' 3rdParty/V8/gypfiles/*.gypi



    # with nixpkgs, it has no sense to check for a version update

    substituteInPlace js/client/client.js --replace "require('@arangodb').checkAvailableVersions();" ""

pkgs/by-name/bc/bcftools/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec { 
  preCheck = ''

    patchShebangs misc/

    patchShebangs test/

    sed -ie 's|/bin/bash|${bash}/bin/bash|' test/test.pl

    sed -i -e 's|/bin/bash|${bash}/bin/bash|' test/test.pl

  '';



  enableParallelBuilding = true;