From 01fec6b3b4a45fd99ae19dc3754cbf63b3f6ccd1 Mon Sep 17 00:00:00 2001
From: Levin Du <zslevin@gmail.com>
Date: Sat, 16 Nov 2019 16:49:00 +0800
Subject: [PATCH] lib/main.sh: allow correctly use of 'head' in BRANCH
 reference. (#1611)

In fetch_from_repo() from general.sh, when ref uses `head` as value, the ref_name
will be set to `HEAD`, which is later used as a subdir:

   local workdir=$dir/$ref_name

This commit makes the directories consistent with the workdir above.
---
 lib/main.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/main.sh b/lib/main.sh
index 9c6ef92280..f3f974c019 100644
--- a/lib/main.sh
+++ b/lib/main.sh
@@ -366,9 +366,13 @@ fi
 compile_sunxi_tools
 install_rkbin_tools
 
-BOOTSOURCEDIR=$BOOTDIR/${BOOTBRANCH##*:}
-LINUXSOURCEDIR=$KERNELDIR/${KERNELBRANCH##*:}
-[[ -n $ATFSOURCE ]] && ATFSOURCEDIR=$ATFDIR/${ATFBRANCH##*:}
+branch2dir() {
+	[[ $1 == head ]] && echo HEAD || echo ${1##*:}
+}
+
+BOOTSOURCEDIR=$BOOTDIR/$(branch2dir ${BOOTBRANCH})
+LINUXSOURCEDIR=$KERNELDIR/$(branch2dir ${KERNELBRANCH})
+[[ -n $ATFSOURCE ]] && ATFSOURCEDIR=$ATFDIR/$(branch2dir ${ATFBRANCH})
 
 # define package names
 DEB_BRANCH=${BRANCH//default}