diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-01-18 20:16:00 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-01-18 20:16:00 +0000 |
| commit | c556a6ea46e71e1907d78b71fab36df30297b3ad (patch) | |
| tree | 91a51d04a39ab4db1fb5182b56ce63cf9d9779b9 /pkgs/tools | |
| parent | f7159c195a623c311829c38c40ef010ac6e943f7 (diff) | |
* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
Diffstat (limited to 'pkgs/tools')
100 files changed, 129 insertions, 129 deletions
diff --git a/pkgs/tools/X11/x2vnc/default.nix b/pkgs/tools/X11/x2vnc/default.nix index a3d21ab1800e..adc04b629444 100644 --- a/pkgs/tools/X11/x2vnc/default.nix +++ b/pkgs/tools/X11/x2vnc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { xorg.libXrandr xorg.randrproto ]; - preInstall = "ensureDir $out"; + preInstall = "mkdir -p $out"; meta = { homepahe = http://fredrik.hubbe.net/x2vnc.html; diff --git a/pkgs/tools/X11/x2x/default.nix b/pkgs/tools/X11/x2x/default.nix index abe5c9b59d60..5d68e1da1ba9 100644 --- a/pkgs/tools/X11/x2x/default.nix +++ b/pkgs/tools/X11/x2x/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/bin - ensureDir $out/man/man1 + mkdir -p $out/bin + mkdir -p $out/man/man1 cp x2x $out/bin/ cp x2x.1 $out/man/man1/ ''; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 0691521e44cf..cf7692cc58ac 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out + mkdir -p $out cp -r install/* $out for i in $(cd $out/bin && ls); do diff --git a/pkgs/tools/admin/tightvnc/builder.sh b/pkgs/tools/admin/tightvnc/builder.sh index 72fced377286..10590bbfcf1e 100644 --- a/pkgs/tools/admin/tightvnc/builder.sh +++ b/pkgs/tools/admin/tightvnc/builder.sh @@ -31,13 +31,13 @@ buildPhase() { } installPhase() { - ensureDir $out/bin - ensureDir $out/share/man/man1 + mkdir -p $out/bin + mkdir -p $out/share/man/man1 ./vncinstall $out/bin $out/share/man # fix HTTP client: t=$out/share/tightvnc - ensureDir $t + mkdir -p $t sed -i "s@/usr/local/vnc/classes@$out/vnc/classes@g" $out/bin/vncserver cp -r classes $t } diff --git a/pkgs/tools/archivers/unarj/default.nix b/pkgs/tools/archivers/unarj/default.nix index 7a15514a7287..0852674e8c89 100644 --- a/pkgs/tools/archivers/unarj/default.nix +++ b/pkgs/tools/archivers/unarj/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; preInstall = '' - ensureDir $out/bin + mkdir -p $out/bin sed -i -e s,/usr/local/bin,$out/bin, Makefile ''; diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index 20d5ae7715e5..b1fd5a10c2b4 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp unetbootin $out/bin - ensureDir $out/share/unetbootin + mkdir -p $out/share/unetbootin cp unetbootin_*.qm $out/share/unetbootin - ensureDir $out/share/applications + mkdir -p $out/share/applications cp unetbootin.desktop $out/share/applications wrapProgram $out/bin/unetbootin \ 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" |