From 9fe26eed9ed92ab3899e7aa30f9d40a793af64ed Mon Sep 17 00:00:00 2001 From: Lionello Lunesu Date: Fri, 4 May 2018 07:41:06 +0800 Subject: [PATCH] nix-prefetch-git: fix handling of submodules with spaces The script would parse the output of `git submodule status` but didn't handle paths with spaces in them. This would result in the following error when trying to determine the URL of the submodule: error: key does not contain a section: .url --- pkgs/build-support/fetchgit/nix-prefetch-git | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 2441da156d1a..1d993dcc1094 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -185,7 +185,7 @@ init_submodules(){ # checkout each submodule hash=$(echo "$l" | awk '{print $1}' | tr -d '-') - dir=$(echo "$l" | awk '{print $2}') + dir=$(echo "$l" | sed -n 's/^ \{0,1\}[^ ]* \(.*\) ([^ ]*)$/\1/p') name=$( git config -f .gitmodules --get-regexp submodule\..*\.path | sed -n "s,^\(.*\)\.path $dir\$,\\1,p")