lix-project/lix
20
57
Fork 31
Code Issues 348 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge pull request #1252 from bjornfor/channel-rename-fix

Browse source 
unpack-channel.nix: fix 'mv' corner case
This commit is contained in:
Domen Kožar 2017-02-27 13:12:35 +01:00 committed by GitHub
parent 89ffe1eff9 f72206b736
commit f0bbd153c6
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
corepkgs/unpack-channel.nix
View file

@ -15,7 +15,9 @@ let
else else
${bzip2} -d < $src | ${tar} xf - ${tarFlags} ${bzip2} -d < $src | ${tar} xf - ${tarFlags}
fi fi
if [ * != $channelName ]; then
mv * $out/$channelName mv * $out/$channelName
fi
if [ -n "$binaryCacheURL" ]; then if [ -n "$binaryCacheURL" ]; then
mkdir $out/binary-caches mkdir $out/binary-caches
echo -n "$binaryCacheURL" > $out/binary-caches/$channelName echo -n "$binaryCacheURL" > $out/binary-caches/$channelName