stdenv/stripHash: print to stdout, not to variable
`stripHash` documentation states that it prints out the stripped name to the stdout, but the function stored the value in `strippedName` instead. Basically all usages did something like `$(stripHash $foo | echo $strippedName)` which is just braindamaged. Fixed the implementation and all invocations.
This commit is contained in:
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
|
||||
sourceRoot = "./";
|
||||
|
||||
unpackCmd = ''
|
||||
ttfName=$(basename $(stripHash $curSrc; echo $strippedName))
|
||||
ttfName=$(basename $(stripHash $curSrc))
|
||||
cp $curSrc ./$ttfName
|
||||
'';
|
||||
|
||||
|
||||
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
|
||||
sourceRoot = "./";
|
||||
|
||||
unpackCmd = ''
|
||||
ttfName=$(basename $(stripHash $curSrc; echo $strippedName))
|
||||
ttfName=$(basename $(stripHash $curSrc))
|
||||
cp $curSrc ./$ttfName
|
||||
'';
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
|
||||
sourceRoot = "./";
|
||||
|
||||
unpackCmd = ''
|
||||
ttfName=$(basename $(stripHash $curSrc; echo $strippedName))
|
||||
ttfName=$(basename $(stripHash $curSrc))
|
||||
cp $curSrc ./$ttfName
|
||||
'';
|
||||
|
||||
|
||||
@@ -3,5 +3,4 @@ source $stdenv/setup
|
||||
mkdir -p $out/xml/dtd/docbook-ebnf
|
||||
cd $out/xml/dtd/docbook-ebnf
|
||||
cp -p $dtd dbebnf.dtd
|
||||
stripHash $catalog
|
||||
cp -p $catalog $strippedName
|
||||
cp -p $catalog $(stripHash $catalog)
|
||||
|
||||
Reference in New Issue
Block a user