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

  function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644

7 files changed, 9 insertions, 9 deletions

diff --git a/pkgs/tools/security/bmrsa/11.nix b/pkgs/tools/security/bmrsa/11.nix
index 0a830e75d804..3200d27c004b 100644
--- a/pkgs/tools/security/bmrsa/11.nix
+++ b/pkgs/tools/security/bmrsa/11.nix
@@ -26,7 +26,7 @@ rec {
     cd bmrsa 
     unzip ${src}
     sed -e 's/gcc/g++/' -i Makefile
-    ensureDir $out/bin
+    mkdir -p $out/bin
     echo -e 'install:\n\tcp bmrsa '$out'/bin' >> Makefile
   '') ["minInit" "addInputs" "defEnsureDir"];
       
diff --git a/pkgs/tools/security/chkrootkit/default.nix b/pkgs/tools/security/chkrootkit/default.nix
index e7545ac8cd6a..73f7f8c9ae5e 100644
--- a/pkgs/tools/security/chkrootkit/default.nix
+++ b/pkgs/tools/security/chkrootkit/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   };
 
   installPhase = "
-    ensureDir $out/sbin
+    mkdir -p $out/sbin
     cp check_wtmpx chkdirs chklastlog chkproc chkrootkit chkutmp chkwtmp ifpromisc strings-static $out/sbin
   ";
   
diff --git a/pkgs/tools/security/metasploit/3.1.nix b/pkgs/tools/security/metasploit/3.1.nix
index 94bc009080df..e02ce1316ba9 100644
--- a/pkgs/tools/security/metasploit/3.1.nix
+++ b/pkgs/tools/security/metasploit/3.1.nix
@@ -9,8 +9,8 @@ rec {
   configureFlags = [];
 
   doInstall = fullDepEntry(''
-    ensureDir $out/share/msf
-    ensureDir $out/bin
+    mkdir -p $out/share/msf
+    mkdir -p $out/bin
 
     cp -r * $out/share/msf
 
diff --git a/pkgs/tools/security/opensc-dnie-wrapper/default.nix b/pkgs/tools/security/opensc-dnie-wrapper/default.nix
index ec649790e677..b36d99f8ebf0 100644
--- a/pkgs/tools/security/opensc-dnie-wrapper/default.nix
+++ b/pkgs/tools/security/opensc-dnie-wrapper/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   phases = [ "installPhase" ];
 
   installPhase = ''
-    ensureDir $out/etc
+    mkdir -p $out/etc
     cp ${opensc}/etc/opensc.conf $out/etc
     chmod +w $out/etc/opensc.conf
 
diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix
index d5462a1120ae..3ca410328152 100644
--- a/pkgs/tools/security/pius/default.nix
+++ b/pkgs/tools/security/pius/default.nix
@@ -19,10 +19,10 @@ stdenv.mkDerivation {
   buildPhase = "true";
 
   installPhase =
-    '' ensureDir "$out/bin"
+    '' mkdir -p "$out/bin"
        cp -v pius "$out/bin"
 
-       ensureDir "$out/doc/pius-${version}"
+       mkdir -p "$out/doc/pius-${version}"
        cp -v README "$out/doc/pius-${version}"
     '';
 
diff --git a/pkgs/tools/security/seccure/0.4.nix b/pkgs/tools/security/seccure/0.4.nix
index 0a1452e53556..33a77c078446 100644
--- a/pkgs/tools/security/seccure/0.4.nix
+++ b/pkgs/tools/security/seccure/0.4.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     sed -e s@/usr/@$out/@g -i Makefile
     sed -e 's@ln -f@ln -sf@g' -i Makefile
-    ensureDir $out/bin $out/share/man/man1
+    mkdir -p $out/bin $out/share/man/man1
   '';
 
   meta = {
diff --git a/pkgs/tools/security/ssss/default.nix b/pkgs/tools/security/ssss/default.nix
index 3816df415c69..74682d00d033 100644
--- a/pkgs/tools/security/ssss/default.nix
+++ b/pkgs/tools/security/ssss/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
       sed -e s@/usr/@$out/@g -i Makefile
       cp ssss.manpage.xml ssss.1
       cp ssss.manpage.xml ssss.1.html
-      ensureDir $out/bin $out/share/man/man1
+      mkdir -p $out/bin $out/share/man/man1
       echo -e 'install:\n\tcp ssss-combine ssss-split '"$out"'/bin' >>Makefile
     '';