Merge pull request #1252 from bjornfor/channel-rename-fix
unpack-channel.nix: fix 'mv' corner case
This commit is contained in:
		
						commit
						f0bbd153c6
					
				
					 1 changed files with 3 additions and 1 deletions
				
			
		| 
						 | 
					@ -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
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue