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/build-support/builder-defs/builder-defs.nix | 26 +++++++++++----------- pkgs/build-support/clang-wrapper/builder.sh | 4 ++-- pkgs/build-support/dotnetenv/build-solution.nix | 4 ++-- pkgs/build-support/fetchcvs/builder.sh | 2 +- pkgs/build-support/gcc-cross-wrapper/default.nix | 2 +- pkgs/build-support/gcc-upc-wrapper/builder.sh | 4 ++-- pkgs/build-support/gcc-wrapper/builder.sh | 4 ++-- pkgs/build-support/kernel/make-initrd.sh | 2 +- pkgs/build-support/kernel/modules-closure.sh | 2 +- pkgs/build-support/make-desktopitem/default.nix | 2 +- pkgs/build-support/make-wrapper/make-wrapper.sh | 2 +- .../native-darwin-cctools-wrapper/builder.sh | 2 +- pkgs/build-support/nuke-references/builder.sh | 2 +- pkgs/build-support/release/ant-build.nix | 6 ++--- pkgs/build-support/release/binary-tarball.nix | 4 ++-- pkgs/build-support/release/debian-build.nix | 4 ++-- pkgs/build-support/release/maven-build.nix | 4 ++-- pkgs/build-support/release/nix-build.nix | 4 ++-- pkgs/build-support/release/rpm-build.nix | 2 +- pkgs/build-support/release/source-tarball.nix | 4 ++-- pkgs/build-support/substitute/substitute-all.sh | 2 +- pkgs/build-support/trivial-builders.nix | 2 +- .../upstream-updater/attrset-to-dir.nix | 2 +- pkgs/build-support/vm/default.nix | 14 ++++++------ pkgs/build-support/vsenv/build-solution.nix | 2 +- 25 files changed, 54 insertions(+), 54 deletions(-) (limited to 'pkgs/build-support') diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix index ba13a0911f7af..50ab7b9a6c1e3 100644 --- a/pkgs/build-support/builder-defs/builder-defs.nix +++ b/pkgs/build-support/builder-defs/builder-defs.nix @@ -320,7 +320,7 @@ let inherit (builtins) head tail trace; in # changing this ? see [1] doForceShare = fullDepEntry (" - ensureDir \"\$prefix/share\" + mkdir -p \"\$prefix/share\" for d in ${toString forceShare}; do if [ -d \"\$prefix/\$d\" -a ! -d \"\$prefix/share/\$d\" ]; then mv -v \"\$prefix/\$d\" \"\$prefix/share\" @@ -332,7 +332,7 @@ let inherit (builtins) head tail trace; in doForceCopy = fullDepEntry ('' name="$(basename $out)" name="''${name#*-}" - ensureDir "$prefix/share/$name" + mkdir -p "$prefix/share/$name" for f in ${toString forceCopy}; do cp -r "$f" "$prefix/share/$name/$f" || true done; @@ -393,7 +393,7 @@ let inherit (builtins) head tail trace; in preservePathWrapperArguments = ''''${PATH:+ --prefix PATH : $PATH }''; doPropagate = fullDepEntry (" - ensureDir \$out/nix-support + mkdir -p \$out/nix-support echo '${toString (attrByPath ["propagatedBuildInputs"] [] args)}' >\$out/nix-support/propagated-build-inputs ") ["minInit" "defEnsureDir"]; @@ -410,7 +410,7 @@ let inherit (builtins) head tail trace; in '') ["minInit" "addInputs" "doUnpack"]; doScons = fullDepEntry ('' - ensureDir $out + mkdir -p $out ${if (attrByPath ["sconsCleanEnv"] false args) then "" else '' @@ -462,13 +462,13 @@ let inherit (builtins) head tail trace; in x.text + "\n" + after ;}; createDirs = fullDepEntry (concatStringsSep ";" - (map (x: "ensureDir ${x}") (attrByPath ["neededDirs"] [] args)) + (map (x: "mkdir -p ${x}") (attrByPath ["neededDirs"] [] args)) ) ["minInit" "defEnsureDir"]; copyExtraDoc = fullDepEntry ('' name="$(basename $out)" name="''${name#*-}" - ensureDir "$out/share/doc/$name" + mkdir -p "$out/share/doc/$name" '' + (concatStringsSep ";" (map (x: ''cp "${x}" "$out/share/doc/$name" || true;'') @@ -547,11 +547,11 @@ let inherit (builtins) head tail trace; in installFonts = let retrievedName = (if args ? name then args.name else ""); in fullDepEntry ('' - ensureDir $out/share/fonts/truetype/public/${retrievedName} - ensureDir $out/share/fonts/opentype/public/${retrievedName} - ensureDir $out/share/fonts/type1/public/${retrievedName} - ensureDir $out/share/texmf/fonts/enc/${retrievedName} - ensureDir $out/share/texmf/fonts/map/${retrievedName} + mkdir -p $out/share/fonts/truetype/public/${retrievedName} + mkdir -p $out/share/fonts/opentype/public/${retrievedName} + mkdir -p $out/share/fonts/type1/public/${retrievedName} + mkdir -p $out/share/texmf/fonts/enc/${retrievedName} + mkdir -p $out/share/texmf/fonts/map/${retrievedName} cp *.ttf $out/share/fonts/truetype/public/${retrievedName} || echo No TrueType fonts cp *.otf $out/share/fonts/opentype/public/${retrievedName} || echo No OpenType fonts @@ -561,7 +561,7 @@ let inherit (builtins) head tail trace; in '') ["minInit" "defEnsureDir"]; simplyShare = shareName: fullDepEntry ('' - ensureDir $out/share + mkdir -p $out/share cp -r . $out/share/${shareName} '') ["doUnpack" "defEnsureDir"]; @@ -588,7 +588,7 @@ let inherit (builtins) head tail trace; in '') ["minInit"]; createPythonInstallationTarget = fullDepEntry ('' - ensureDir $(toPythonPath $out) + mkdir -p $(toPythonPath $out) export PYTHONPATH=$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath $out) '') ["minInit" "addInputs" "defEnsureDir"]; diff --git a/pkgs/build-support/clang-wrapper/builder.sh b/pkgs/build-support/clang-wrapper/builder.sh index fe714a0719a11..9f1542e041135 100644 --- a/pkgs/build-support/clang-wrapper/builder.sh +++ b/pkgs/build-support/clang-wrapper/builder.sh @@ -1,8 +1,8 @@ source $stdenv/setup -ensureDir $out/bin -ensureDir $out/nix-support +mkdir -p $out/bin +mkdir -p $out/nix-support if test -z "$nativeLibc"; then diff --git a/pkgs/build-support/dotnetenv/build-solution.nix b/pkgs/build-support/dotnetenv/build-solution.nix index 07f1f89c67ce1..b1853bf73641a 100644 --- a/pkgs/build-support/dotnetenv/build-solution.nix +++ b/pkgs/build-support/dotnetenv/build-solution.nix @@ -71,14 +71,14 @@ stdenv.mkDerivation { export AssemblySearchPaths=$assemblySearchPaths fi - ensureDir $out + mkdir -p $out MSBuild.exe ${toString slnFile} /nologo /t:${targets} /p:IntermediateOutputPath=$(cygpath --windows $out)\\ /p:OutputPath=$(cygpath --windows $out)\\ /verbosity:${verbosity} ${options} # Because .NET assemblies store strings as UTF-16 internally, we cannot detect # hashes. Therefore a text files containing the proper paths is created # We can also use this file the propagate transitive dependencies. - ensureDir $out/nix-support + mkdir -p $out/nix-support for i in ${toString assemblyInputs} do diff --git a/pkgs/build-support/fetchcvs/builder.sh b/pkgs/build-support/fetchcvs/builder.sh index 3a1df2553e152..6ee594b33b274 100644 --- a/pkgs/build-support/fetchcvs/builder.sh +++ b/pkgs/build-support/fetchcvs/builder.sh @@ -6,7 +6,7 @@ source $stdenv/setup # should work (but didn't - got no response on #cvs) # See als man Page for those options -ensureDir export +mkdir -p export if [ -n "$tag" ]; then tag="-r $tag" else diff --git a/pkgs/build-support/gcc-cross-wrapper/default.nix b/pkgs/build-support/gcc-cross-wrapper/default.nix index 8bf820e3d3413..ab879c1841fc0 100644 --- a/pkgs/build-support/gcc-cross-wrapper/default.nix +++ b/pkgs/build-support/gcc-cross-wrapper/default.nix @@ -20,7 +20,7 @@ let phases = [ "installPhase" ]; installPhase = '' echo $out - ensureDir $out + mkdir -p $out cp -Rd ${gcc}/${cross.config}/lib $out/lib chmod -R +w $out/lib for a in $out/lib/*.la; do diff --git a/pkgs/build-support/gcc-upc-wrapper/builder.sh b/pkgs/build-support/gcc-upc-wrapper/builder.sh index 0c9dccf6edb39..af121afe155a1 100644 --- a/pkgs/build-support/gcc-upc-wrapper/builder.sh +++ b/pkgs/build-support/gcc-upc-wrapper/builder.sh @@ -1,8 +1,8 @@ source $stdenv/setup -ensureDir $out/bin -ensureDir $out/nix-support +mkdir -p $out/bin +mkdir -p $out/nix-support if test -z "$nativeLibc"; then diff --git a/pkgs/build-support/gcc-wrapper/builder.sh b/pkgs/build-support/gcc-wrapper/builder.sh index 2e87d82f52cd1..ad2b8003f090d 100644 --- a/pkgs/build-support/gcc-wrapper/builder.sh +++ b/pkgs/build-support/gcc-wrapper/builder.sh @@ -1,8 +1,8 @@ source $stdenv/setup -ensureDir $out/bin -ensureDir $out/nix-support +mkdir -p $out/bin +mkdir -p $out/nix-support if test -z "$nativeLibc"; then diff --git a/pkgs/build-support/kernel/make-initrd.sh b/pkgs/build-support/kernel/make-initrd.sh index 69931bad113cf..8d334447b6dd8 100644 --- a/pkgs/build-support/kernel/make-initrd.sh +++ b/pkgs/build-support/kernel/make-initrd.sh @@ -35,7 +35,7 @@ storePaths=$(perl $pathsFromGraph closure-*) # Put the closure in a gzipped cpio archive. -ensureDir $out +mkdir -p $out (cd root && find * -print0 | cpio -ov -H newc --null | gzip -9 > $out/initrd) if [ -n "$makeUInitrd" ]; then diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh index faf6e92fdff1b..aa2615eb578dc 100644 --- a/pkgs/build-support/kernel/modules-closure.sh +++ b/pkgs/build-support/kernel/modules-closure.sh @@ -25,7 +25,7 @@ for module in $rootModules; do done echo "closure:" -ensureDir $out/lib/modules/"$version" +mkdir -p $out/lib/modules/"$version" for module in $closure; do target=$(echo $module | sed "s^$NIX_STORE.*/lib/modules/^$out/lib/modules/^") if test -e "$target"; then continue; fi diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/build-support/make-desktopitem/default.nix index 7f3b97a33b79a..c7f2aea233937 100644 --- a/pkgs/build-support/make-desktopitem/default.nix +++ b/pkgs/build-support/make-desktopitem/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { inherit name; buildCommand = '' - ensureDir $out/share/applications + mkdir -p $out/share/applications cat > $out/share/applications/$name.desktop < $wrapper diff --git a/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh b/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh index c79b3709ee8b4..2e2e125c6495e 100644 --- a/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh +++ b/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh @@ -1,6 +1,6 @@ source $stdenv/setup -ensureDir $out/bin +mkdir -p $out/bin for i in ar as c++filt gprof ld nm nmedit ranlib size strings strip dsymutil libtool; do ln -s /usr/bin/$i $out/bin/ done diff --git a/pkgs/build-support/nuke-references/builder.sh b/pkgs/build-support/nuke-references/builder.sh index 3b9324073ef88..9e8c464d8288c 100644 --- a/pkgs/build-support/nuke-references/builder.sh +++ b/pkgs/build-support/nuke-references/builder.sh @@ -1,6 +1,6 @@ source $stdenv/setup -ensureDir $out/bin +mkdir -p $out/bin cat > $out/bin/nuke-refs <> $out/bin/${w.name} < $out/nix-support/system # If `src' is the result of a call to `makeSourceTarball', then it diff --git a/pkgs/build-support/release/binary-tarball.nix b/pkgs/build-support/release/binary-tarball.nix index f8bb5282ee2f1..6901c9f5555f4 100644 --- a/pkgs/build-support/release/binary-tarball.nix +++ b/pkgs/build-support/release/binary-tarball.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation ( name = name + (if src ? version then "-" + src.version else ""); postHook = '' - ensureDir $out/nix-support + mkdir -p $out/nix-support echo "$system" > $out/nix-support/system # If `src' is the result of a call to `makeSourceTarball', then it @@ -62,7 +62,7 @@ stdenv.mkDerivation ( distPhase = '' - ensureDir $out/tarballs + mkdir -p $out/tarballs tar cvfj $out/tarballs/''${releaseName:-binary-dist}.tar.bz2 -C $TMPDIR/inst . ''; diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index 070a54fc945cc..8d2ea849a09f8 100644 --- a/pkgs/build-support/release/debian-build.nix +++ b/pkgs/build-support/release/debian-build.nix @@ -30,7 +30,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( # !!! cut&paste from rpm-build.nix postHook = '' - ensureDir $out/nix-support + mkdir -p $out/nix-support cat "$diskImage"/nix-support/full-name > $out/nix-support/full-name # If `src' is the result of a call to `makeSourceTarball', then it @@ -67,7 +67,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( --provides="${concatStringsSep "," debProvides}" \ make install - ensureDir $out/debs + mkdir -p $out/debs find . -name "*.deb" -exec cp {} $out/debs \; [ "$(echo $out/debs/*.deb)" != "" ] diff --git a/pkgs/build-support/release/maven-build.nix b/pkgs/build-support/release/maven-build.nix index 66dd10005f20e..39f069cd57f05 100644 --- a/pkgs/build-support/release/maven-build.nix +++ b/pkgs/build-support/release/maven-build.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation ( rec { setupPhase = '' runHook preSetupPhase - ensureDir $out/nix-support + mkdir -p $out/nix-support export LANG="en_US.UTF-8" export LOCALE_ARCHIVE=$glibcLocales/lib/locale/locale-archive export M2_REPO=$TMPDIR/repository @@ -74,7 +74,7 @@ stdenv.mkDerivation ( rec { ''; mvnRelease = '' - ensureDir $out/release + mkdir -p $out/release zip=$(ls target/*.zip| head -1) releaseName=$(basename $zip .zip) diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index a32f0e07a0cc3..64d8b8f192478 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation ( if test -n "$keepBuildDirectory"; then KEEPBUILDDIR="$out/`basename $TMPDIR`" header "Copying build directory to $KEEPBUILDDIR" - ensureDir $KEEPBUILDDIR + mkdir -p $KEEPBUILDDIR cp -R $TMPDIR/* $KEEPBUILDDIR stopNest fi @@ -56,7 +56,7 @@ stdenv.mkDerivation ( name = name + (if src ? version then "-" + src.version else ""); postHook = '' - ensureDir $out/nix-support + mkdir -p $out/nix-support echo "$system" > $out/nix-support/system if test -z "${toString doCoverageAnalysis}"; then diff --git a/pkgs/build-support/release/rpm-build.nix b/pkgs/build-support/release/rpm-build.nix index 326ccbe9c4284..26b120e5b1d06 100644 --- a/pkgs/build-support/release/rpm-build.nix +++ b/pkgs/build-support/release/rpm-build.nix @@ -14,7 +14,7 @@ vmTools.buildRPM ( name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else ""); preBuild = '' - ensureDir $out/nix-support + mkdir -p $out/nix-support cat "$diskImage"/nix-support/full-name > $out/nix-support/full-name # If `src' is the result of a call to `makeSourceTarball', then it diff --git a/pkgs/build-support/release/source-tarball.nix b/pkgs/build-support/release/source-tarball.nix index 16ac0033d93bd..af8b9d3c789d1 100644 --- a/pkgs/build-support/release/source-tarball.nix +++ b/pkgs/build-support/release/source-tarball.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation ( if test -n "$keepBuildDirectory"; then KEEPBUILDDIR="$out/`basename $TMPDIR`" header "Copying build directory to $KEEPBUILDDIR" - ensureDir $KEEPBUILDDIR + mkdir -p $KEEPBUILDDIR cp -R $TMPDIR/* $KEEPBUILDDIR stopNest fi @@ -91,7 +91,7 @@ stdenv.mkDerivation ( buildInputs = buildInputs ++ bootstrapBuildInputs; postHook = '' - ensureDir $out/nix-support + mkdir -p $out/nix-support ''; postUnpack = '' diff --git a/pkgs/build-support/substitute/substitute-all.sh b/pkgs/build-support/substitute/substitute-all.sh index 796a1a471529f..ec220481fcc09 100644 --- a/pkgs/build-support/substitute/substitute-all.sh +++ b/pkgs/build-support/substitute/substitute-all.sh @@ -7,7 +7,7 @@ args= target=$out if test -n "$dir"; then target=$out/$dir/$name - ensureDir $out/$dir + mkdir -p $out/$dir fi substituteAll $src $target diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 5defdb55b9595..1815c99a9f4b7 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -48,7 +48,7 @@ rec { makeSetupHook = { deps ? [], substitutions ? {} }: script: runCommand "hook" substitutions ('' - ensureDir $out/nix-support + mkdir -p $out/nix-support cp ${script} $out/nix-support/setup-hook '' + stdenv.lib.optionalString (deps != []) '' echo ${toString deps} > $out/nix-support/propagated-build-native-inputs diff --git a/pkgs/build-support/upstream-updater/attrset-to-dir.nix b/pkgs/build-support/upstream-updater/attrset-to-dir.nix index a05f80da085a8..bdf44b7a5bf30 100644 --- a/pkgs/build-support/upstream-updater/attrset-to-dir.nix +++ b/pkgs/build-support/upstream-updater/attrset-to-dir.nix @@ -1,7 +1,7 @@ a : a.stdenv.mkDerivation rec { buildCommand = '' - ensureDir "$out/attributes" + mkdir -p "$out/attributes" '' + (a.lib.concatStrings (map (n: '' diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 207edce147b1d..63fc994af37ab 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -29,8 +29,8 @@ rec { allowedReferences = [ "out" modulesClosure ]; # prevent accidents like glibc being included in the initrd } '' - ensureDir $out/bin - ensureDir $out/lib + mkdir -p $out/bin + mkdir -p $out/lib # Copy what we need from Glibc. cp -p ${glibc}/lib/ld-linux*.so.? $out/lib @@ -364,8 +364,8 @@ rec { ${module_init_tools}/sbin/modprobe cramfs mknod /dev/loop0 b 7 0 - ensureDir $out - ensureDir tmp + mkdir -p $out + mkdir -p tmp mount -o loop,ro,ufstype=44bsd ${lib.optionalString (fs != null) "-t ${fs} "}${file} tmp || mount -o loop,ro ${lib.optionalString (fs != null) "-t ${fs} "}${file} tmp cp -Rv tmp/* $out/ || exit 0 @@ -388,8 +388,8 @@ rec { mknod /dev/mtd0 c 90 0 mknod /dev/mtdblock0 b 31 0 - ensureDir $out - ensureDir tmp + mkdir -p $out + mkdir -p tmp dd if=${file} of=/dev/mtd0 mount ${lib.optionalString (fs != null) "-t ${fs} "}/dev/mtdblock0 tmp @@ -610,7 +610,7 @@ rec { installPhase = '' eval "$preInstall" - ensureDir $out/$outDir + mkdir -p $out/$outDir find $rpmout -name "*.rpm" -exec cp {} $out/$outDir \; for i in $out/$outDir/*.rpm; do diff --git a/pkgs/build-support/vsenv/build-solution.nix b/pkgs/build-support/vsenv/build-solution.nix index 7d7d6a86e1f35..32dd06abfaf39 100644 --- a/pkgs/build-support/vsenv/build-solution.nix +++ b/pkgs/build-support/vsenv/build-solution.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { installPhase = '' cd ${baseDir} vcbuild.exe /rebuild ${slnFile} - ensureDir $out + mkdir -p $out cp Debug/* $out ''; buildInputs = [ vs ] ++ extraBuildInputs; -- cgit 1.4.1