Hi!
Review the attached patch, please.
--
Yury G. Kudryashov,
mailto: [email protected]
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index ee115aa..c497750 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -39,7 +39,7 @@ exitHandler() {
# normally. Otherwise, return the original exit code.
if [ -n "$succeedOnFailure" ]; then
echo "build failed with exit code $exitCode (ignored)"
- mkdir -p "$out/nix-support"
+ mkdir -pv "$out/nix-support"
echo -n $exitCode > "$out/nix-support/failed"
exit 0
fi
@@ -122,13 +122,13 @@ fi
ensureDir() {
local dir
for dir in "$@"; do
- if ! [ -x "$dir" ]; then mkdir -p "$dir"; fi
+ if ! [ -x "$dir" ]; then mkdir -pv "$dir"; fi
done
}
installBin() {
- mkdir -p $out/bin
- cp "$@" $out/bin
+ mkdir -pv $out/bin
+ cp -v "$@" $out/bin
}
@@ -671,7 +671,7 @@ patchShebangs() {
installPhase() {
runHook preInstall
- mkdir -p "$prefix"
+ mkdir -pv "$prefix"
installTargets=${installTargets:-install}
echo "install flags: $installTargets $makeFlags ${makeFlagsArray[@]} $installFlags ${installFlagsArray[@]}"
@@ -744,13 +744,15 @@ fixupPhase() {
fi
if [ -n "$propagatedBuildInputs" ]; then
- mkdir -p "$out/nix-support"
- echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs"
+ mkdir -pv "$out/nix-support"
+ echo -n "Propagated build inputs: "
+ echo "$propagatedBuildInputs" | tee "$out/nix-support/propagated-build-inputs"
fi
if [ -n "$propagatedBuildNativeInputs" ]; then
- mkdir -p "$out/nix-support"
- echo "$propagatedBuildNativeInputs" > "$out/nix-support/propagated-build-native-inputs"
+ mkdir -pv "$out/nix-support"
+ echo -n "Propagated build native inputs: "
+ echo "$propagatedBuildNativeInputs" | tee "$out/nix-support/propagated-build-native-inputs"
fi
if [ -n "$setupHook" ]; then
@@ -769,7 +771,7 @@ distPhase() {
make ${makefile:+-f $makefile} $distFlags "${distFlagsArray[@]}" ${distTarget:-dist}
if [ "$dontCopyDist" != 1 ]; then
- mkdir -p "$out/tarballs"
+ mkdir -pv "$out/tarballs"
# Note: don't quote $tarballs, since we explicitly permit
# wildcards in there.
_______________________________________________
nix-dev mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-dev
