* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless

function, so obsolete it. svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
parent f7159c195a
commit c556a6ea46
629 changed files with 931 additions and 939 deletions
--- a/pkgs/tools/misc/autojump/default.nix
+++ b/pkgs/tools/misc/autojump/default.nix
@@ -21,10 +21,10 @@ let version = "4"; in
    buildInputs = [ python ];

    installPhase = ''
-      ensureDir "$out/bin" "$out/share/man/man1"
+      mkdir -p "$out/bin" "$out/share/man/man1"
      yes no | sh ./install.sh

-      ensureDir "$out/etc/bash_completion.d"
+      mkdir -p "$out/etc/bash_completion.d"
      cp -v autojump.bash "$out/etc/bash_completion.d"

      echo "Bash users: Make sure to source \`$out/etc/bash_completion.d/autojump.bash'"
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
  installPhase = ''
    cp -r . $out; cd $out
    t=bin/debootstrap
-    ensureDir bin man/man8
+    mkdir -p bin man/man8
    cat >> $t << EOF
    #!/bin/sh
    export DEBOOTSTRAP_DIR=$out/usr/share/debootstrap
@@ -66,7 +66,7 @@ stdenv.mkDerivation {
  /* build from source:
  installPhase = ''
    cp ${devices} devices.tar.gz
-    ensureDir $out/{bin,man/man8};
+    mkdir -p $out/{bin,man/man8};
    cp debootstrap.8 $out/man/man8
    sed -i  \
      -e 's@-o root@@'   \
--- a/pkgs/tools/misc/dmg2img/default.nix
+++ b/pkgs/tools/misc/dmg2img/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
  buildInputs = [zlib bzip2 openssl];

  installPhase = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
    cp dmg2img $out/bin
  '';
 }
--- a/pkgs/tools/misc/dtach/default.nix
+++ b/pkgs/tools/misc/dtach/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
  };

  installPhase = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
    cp dtach $out/bin/dtach
  '';

--- a/pkgs/tools/misc/expect/default.nix
+++ b/pkgs/tools/misc/expect/default.nix
@@ -32,5 +32,5 @@ stdenv.mkDerivation {
    description = "A tool for automating interactive applications";
    homepage = http://expect.nist.gov/;
  };
-  postInstall="cp expect{,k} $out/bin; ensureDir $out/lib; cp *.so $out/lib";
+  postInstall="cp expect{,k} $out/bin; mkdir -p $out/lib; cp *.so $out/lib";
 }
--- a/pkgs/tools/misc/fdupes/default.nix
+++ b/pkgs/tools/misc/fdupes/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
  };

  # workaround: otherwise make install fails (should be fixed in trunk)
-  preInstall = "ensureDir $out/bin $out/man/man1";
+  preInstall = "mkdir -p $out/bin $out/man/man1";

  makeFlags = "PREFIX=\${out}";

--- a/pkgs/tools/misc/figlet/default.nix
+++ b/pkgs/tools/misc/figlet/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
  };

  preConfigure = ''
-    ensureDir $out/{man/man6,bin}
+    mkdir -p $out/{man/man6,bin}
    makeFlags="DESTDIR=$out/bin MANDIR=$out/man/man6 DEFAULTFONTDIR=$out/share/figlet"
  '';

--- a/pkgs/tools/misc/hddtemp/default.nix
+++ b/pkgs/tools/misc/hddtemp/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {

  configurePhase =
    ''
-      ensureDir $out/nix-support
+      mkdir -p $out/nix-support
      cp $db $out/nix-support/hddtemp.db
      ./configure --prefix=$out --with-db-path=$out/nix-support/hddtemp.db
    ''; 
--- a/pkgs/tools/misc/jdiskreport/builder.sh
+++ b/pkgs/tools/misc/jdiskreport/builder.sh
@@ -2,11 +2,11 @@ source $stdenv/setup

 unzip $src

-ensureDir $out/jars
+mkdir -p $out/jars
 mv */*.jar $out/jars
 jar=$(ls $out/jars/jdiskreport-*.jar)

-ensureDir $out/bin
+mkdir -p $out/bin
 cat > $out/bin/jdiskreport <<EOF
 #! $SHELL -e
 exec $jdk/bin/java -jar $jar
--- a/pkgs/tools/misc/kermit/default.nix
+++ b/pkgs/tools/misc/kermit/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
  buildInputs = [ ncurses ];

  unpackPhase = ''
-    ensureDir src
+    mkdir -p src
    pushd src
    tar xvzf $src
  '';
@@ -22,8 +22,8 @@ stdenv.mkDerivation {
  '';
  buildPhase = "make -f makefile linux";
  installPhase = ''
-    ensureDir $out/bin
-    ensureDir $out/man/man1
+    mkdir -p $out/bin
+    mkdir -p $out/man/man1
    make -f makefile install
  '';

--- a/pkgs/tools/misc/memtest86/default.nix
+++ b/pkgs/tools/misc/memtest86/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
  NIX_CFLAGS_COMPILE = "-I.";
  
  installPhase = ''
-    ensureDir $out
+    mkdir -p $out
    cp memtest.bin $out/
  '';

--- a/pkgs/tools/misc/myhasktags/default.nix
+++ b/pkgs/tools/misc/myhasktags/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
  };
  phases="buildPhase";
  buildPhase = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
    ghc --make $src -o $out/bin/hasktags-modified
  '';
  buildInputs = [ ghcPlain ];
--- a/pkgs/tools/misc/pk2cmd/default.nix
+++ b/pkgs/tools/misc/pk2cmd/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
  makeFlags = [ "LIBUSB=${libusb}" "linux" ];

  installPhase = ''
-    ensureDir $out/bin $out/share/pk2
+    mkdir -p $out/bin $out/share/pk2
    cp pk2cmd $out/bin
    cp PK2DeviceFile.dat $out/share/pk2
    wrapProgram $out/bin/pk2cmd --prefix PATH : $out/share/pk2
--- a/pkgs/tools/misc/qjoypad/default.nix
+++ b/pkgs/tools/misc/qjoypad/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
  patchPhase = ''
    cd src
    substituteInPlace config --replace /bin/bash /bin/sh
-    ensureDir $out
+    mkdir -p $out
    export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${libX11}/lib"
  '';
  meta = {
--- a/pkgs/tools/misc/rockbox-utility/default.nix
+++ b/pkgs/tools/misc/rockbox-utility/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation  rec {
  '';

  installPhase = ''
-    ensureDir $out/bin 
+    mkdir -p $out/bin 
    cp RockboxUtility $out/bin
  '';

--- a/pkgs/tools/misc/shebangfix/default.nix
+++ b/pkgs/tools/misc/shebangfix/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
  phases = "buildPhase";

  buildPhase = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
    s=$out/bin/shebangfix
    cp $file $s
    chmod +wx $s
--- a/pkgs/tools/misc/ttf2pt1/default.nix
+++ b/pkgs/tools/misc/ttf2pt1/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {

  preConfigure = ''
    find -type f | xargs sed -i 's@/usr/bin/perl@${perl}/bin/perl@'
-    ensureDir $out
+    mkdir -p $out
    sed -e 's/chown/true/' \
        -e 's/chgrp/true/' \
        -e 's@^CFLAGS_FT =.*@CFLAGS_FT=-DUSE_FREETYPE -I${freetype}/include/freetype2@' \
--- a/pkgs/tools/misc/ttmkfdir/default.nix
+++ b/pkgs/tools/misc/ttmkfdir/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
    ];

  preInstall = ''
-    ensureDir $out; makeFlags="DESTDIR=$out BINDIR=/bin"
+    mkdir -p $out; makeFlags="DESTDIR=$out BINDIR=/bin"
  '';

  buildInputs = [freetype fontconfig libunwind libtool flex bison];
--- a/pkgs/tools/misc/vfdecrypt/default.nix
+++ b/pkgs/tools/misc/vfdecrypt/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
  };
  buildInputs = [openssl];
  installPhase = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
    cp vfdecrypt $out/bin
  '';
 }
--- a/pkgs/tools/misc/w3c-css-validator/default.nix
+++ b/pkgs/tools/misc/w3c-css-validator/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation {
          -e '/untar/d' \
          build.xml
    ant
-    ensureDir $out/{bin,lib}
+    mkdir -p $out/{bin,lib}
    JAR=$out/lib/css-validator.jar
    cat >> $out/bin/css-validator << EOF
    #!/bin/sh
--- a/pkgs/tools/misc/xdaliclock/default.nix
+++ b/pkgs/tools/misc/xdaliclock/default.nix
@@ -32,7 +32,7 @@ rec {
  phaseNames = ["doConfigure" "prepareDirs" "doMakeInstall"];

  prepareDirs = a.fullDepEntry ''
-    ensureDir "$out/bin" "$out/share" "$out/share/man/man1"
+    mkdir -p "$out/bin" "$out/share" "$out/share/man/man1"
  '' ["minInit" "defEnsureDir"];

  goSrcDir = "cd X11";