Revert "stdenv: introduce baseHash() to replace stripHash()"

Introduced by mistake

This reverts commit e71a5cb878.
This commit is contained in:
zimbatm
2016-06-25 14:25:58 +01:00
parent 893ab31159
commit 4f5918cd2e
12 changed files with 36 additions and 45 deletions

View File

@@ -4,6 +4,6 @@ mkdir -p $out
for ((i = 1; i <= $nrFrames; i++)); do
echo "producing frame $i...";
targetName=$out/$(baseHash $dotGraph .dot)-f-$i.dot
targetName=$out/$(basename $(stripHash $dotGraph; echo $strippedName) .dot)-f-$i.dot
cpp -DFRAME=$i < $dotGraph > $targetName
done

View File

@@ -185,7 +185,7 @@ rec {
if test -d $postscript; then
input=$(ls $postscript/*.ps)
else
input=$(baseHash $postscript)
input=$(stripHash $postscript; echo $strippedName)
ln -s $postscript $input
fi

View File

@@ -4,7 +4,7 @@ mkdir -p $out
dot2pdf() {
sourceFile=$1
targetName=$out/$(baseHash $sourceFile .dot).pdf
targetName=$out/$(basename $(stripHash $sourceFile; echo $strippedName) .dot).pdf
echo "converting $sourceFile to $targetName..."
export FONTCONFIG_FILE=$fontsConf
dot -Tpdf $sourceFile > $targetName

View File

@@ -4,7 +4,7 @@ mkdir -p $out
dot2ps() {
sourceFile=$1
targetName=$out/$(baseHash $sourceFile .dot).ps
targetName=$out/$(basename $(stripHash $sourceFile; echo $strippedName) .dot).ps
echo "converting $sourceFile to $targetName..."
dot -Tps $sourceFile > $targetName
}

View File

@@ -10,7 +10,7 @@ cd $startDir
lhstex() {
sourceFile=$1
targetName=$out/$(baseHash $sourceFile .lhs).tex
targetName=$out/$(basename $(stripHash $sourceFile; echo $strippedName) .lhs).tex
echo "converting $sourceFile to $targetName..."
lhs2TeX -o "$targetName" $flags "$sourceFile"
}

View File

@@ -16,11 +16,11 @@ for i in $extraFiles; do
if test -d $i; then
ln -s $i/* .
else
ln -s $i $(baseHash $i)
ln -s $i $(stripHash $i; echo $strippedName)
fi
done
rootName=$(baseHash "$rootFile")
rootName=$(basename $(stripHash "$rootFile"; echo $strippedName))
rootNameBase=$(echo "$rootName" | sed 's/\..*//')