diff options
| author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2017-02-27 10:09:48 +0100 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2017-02-27 10:12:58 +0100 |
| commit | f72206b736e4fa1be010a05aa12fa57afea2019c (patch) | |
| tree | a3766cf745448fa52e795035d190092ce93be637 | |
| parent | 89ffe1eff946639aa2752177fcc5159b6926af70 (diff) | |
unpack-channel.nix: fix 'mv' corner case
unpack-channel.nix fails if the tarball contains a directory named the
same as the channel:
mv: cannot move 'nixpkgs' to a subdirectory of itself, '.../nixpkgs'
This commit fixes that by not moving the directory if it already has the
correct name.
| -rw-r--r-- | corepkgs/unpack-channel.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/corepkgs/unpack-channel.nix b/corepkgs/unpack-channel.nix index 9445532de..a654db40e 100644 --- a/corepkgs/unpack-channel.nix +++ b/corepkgs/unpack-channel.nix @@ -15,7 +15,9 @@ let else ${bzip2} -d < $src | ${tar} xf - ${tarFlags} fi - mv * $out/$channelName + if [ * != $channelName ]; then + mv * $out/$channelName + fi if [ -n "$binaryCacheURL" ]; then mkdir $out/binary-caches echo -n "$binaryCacheURL" > $out/binary-caches/$channelName |