Another attempt to eradicate ensureDir

See c556a6ea46.
This commit is contained in:
Eelco Dolstra
2014-06-30 14:56:10 +02:00
parent 47075812ce
commit 40f7b0f9df
128 changed files with 173 additions and 173 deletions

View File

@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
};
installPhase = ''
ensureDir $out/bin
mkdir -p $out/bin
cp fpscan $out/bin
ensureDir $out/opt/f-prot
mkdir -p $out/opt/f-prot
cp fpupdate $out/opt/f-prot
cp product.data.default $out/opt/f-prot/product.data
cp license.key $out/opt/f-prot/
@@ -23,12 +23,12 @@ stdenv.mkDerivation rec {
patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/opt/f-prot/fpupdate
ensureDir $out/share/man/
ensureDir $out/share/man/man1
mkdir -p $out/share/man/
mkdir -p $out/share/man/man1
cp doc/man/fpscan.1 $out/share/man/man1
ensureDir $out/share/man/man5
mkdir -p $out/share/man/man5
cp doc/man/f-prot.conf.5 $out/share/man/man5
ensureDir $out/share/man/man8
mkdir -p $out/share/man/man8
cp doc/man/fpupdate.8 $out/share/man/man8
'';

View File

@@ -18,7 +18,7 @@ stdenv.mkDerivation {
'';
installPhase = ''
ensureDir $out/bin
mkdir -p $out/bin
cp tools/{meo,p11} $out/bin
cp meo-gui/meo-gui $out/bin
cp meo-gui/meo-gui $out/bin

View File

@@ -45,8 +45,8 @@ in stdenv.mkDerivation rec {
'';
installPhase = ''
ensureDir $out/share/tor-browser
ensureDir $out/bin
mkdir -p $out/share/tor-browser
mkdir -p $out/bin
cp -R * $out/share/tor-browser
cat > "$out/bin/tor-browser" << EOF