From c556a6ea46e71e1907d78b71fab36df30297b3ad Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 18 Jan 2012 20:16:00 +0000 Subject: * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless function, so obsolete it. svn path=/nixpkgs/branches/stdenv-updates/; revision=31644 --- pkgs/tools/compression/bsdiff/builder.sh | 4 ++-- pkgs/tools/compression/bzip2/builder.sh | 2 +- pkgs/tools/compression/upx/default.nix | 2 +- pkgs/tools/compression/zdelta/builder.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs/tools/compression') diff --git a/pkgs/tools/compression/bsdiff/builder.sh b/pkgs/tools/compression/bsdiff/builder.sh index 1acb10cb7946..f2792a40a60c 100644 --- a/pkgs/tools/compression/bsdiff/builder.sh +++ b/pkgs/tools/compression/bsdiff/builder.sh @@ -2,7 +2,7 @@ source $stdenv/setup installFlags="PREFIX=$out INSTALL=install" -ensureDir "$out/bin" -ensureDir "$out/man/man1" +mkdir -p "$out/bin" +mkdir -p "$out/man/man1" genericBuild diff --git a/pkgs/tools/compression/bzip2/builder.sh b/pkgs/tools/compression/bzip2/builder.sh index ea2ebc4c2db0..4610bdd40850 100644 --- a/pkgs/tools/compression/bzip2/builder.sh +++ b/pkgs/tools/compression/bzip2/builder.sh @@ -8,7 +8,7 @@ if test -n "$sharedLibrary"; then } preInstall() { - ensureDir $out/lib + mkdir -p $out/lib mv libbz2.so* $out/lib ln -s libbz2.so.1.0 $out/lib/libbz2.so } diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index c3fd01d5c88b..f3b8037a9f19 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { cd src "; - installPhase = "ensureDir $out/bin ; cp upx.out $out/bin/upx"; + installPhase = "mkdir -p $out/bin ; cp upx.out $out/bin/upx"; meta = { homepage = http://upx.sourceforge.net/; diff --git a/pkgs/tools/compression/zdelta/builder.sh b/pkgs/tools/compression/zdelta/builder.sh index 376c0bf4f39c..03db413181d7 100644 --- a/pkgs/tools/compression/zdelta/builder.sh +++ b/pkgs/tools/compression/zdelta/builder.sh @@ -1,7 +1,7 @@ source $stdenv/setup installPhase() { - ensureDir $out/bin + mkdir -p $out/bin cp -p zdc zdu $out/bin } -- cgit v1.2.3