From c90f9c27077843d27d1f859e33d748ada3604dd7 Mon Sep 17 00:00:00 2001
From: mj <mj@str8.biz>
Date: Tue, 24 Nov 2015 21:43:06 +0100
Subject: [PATCH] [IMP] repos.sh

---
 repos.sh | 49 +++++++++++++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/repos.sh b/repos.sh
index ba1facd..75764f7 100755
--- a/repos.sh
+++ b/repos.sh
@@ -42,10 +42,10 @@ fi
 if [ "$ACTION" != "" ]; then
 	exit 0
 else
-	printf "...................................................START..................................................."
+	printf "...................................................START...................................................\n"
 	if [ "$DEF_REPO" ]; then
 		if [ "$DEF_REPO" != "XX" ]; then
-			printf "set var 'ADD_ADDON_REPOS'"
+			printf "set var 'ADD_ADDON_REPOS'\n"
 			ADD_ADDON_REPOS=("$DEF_REPO")
 		fi
 	fi
@@ -71,8 +71,11 @@ else
 	# ADDED_REPOS=":'\n"
 	ADDED_REPOS=""
 	NOT_ADDED_REPOS=""
+	
+	MAIN_BRANCH=${REMOTE_BRANCH}
+	
 	for i in "${ADD_ADDON_REPOS[@]}"; do
-		printf "repo '$i'"
+		printf "repo '$i'\n"
 
 		# Defaults
 		CREATE_LINKS=1
@@ -91,7 +94,7 @@ else
 			i=${j[0]}
 			REMOTE_BRANCH=${j[1]}
 		fi
-		printf "using branch $REMOTE_BRANCH"
+		printf "~~~~~~~~~~~~ USING BRANCH: $REMOTE_BRANCH ~~~~~~~~~~~~\n"
 
 		REPO=${i} && REPL="--" && REMOTE=${REPO/\//$REPL}
 		if [ "$UPDATE" = "1" ]; then
@@ -99,14 +102,14 @@ else
 			SUBTREE_CMD="pull"
 			git subtree ${SUBTREE_CMD} --prefix=${PATH_PREFIX}/${REPO} remote--${REMOTE} ${REMOTE_BRANCH} --squash -q
 
-			while read line; do
-				if [[ ${REPO} == ${line} ]]; then
-					printf "++++++ MATCH ++++++"
-					CREATE_LINKS=0
-				fi
-				printf "+++++ NOMATCH +++++"
-				printf ${REPO}
-			done < ignore.txt
+#			while read line; do
+#				if [[ ${REPO} == ${line} ]]; then
+#					printf "++++++ MATCH ++++++\n"
+#					CREATE_LINKS=0
+#				fi
+#				printf "+++++ NOMATCH +++++ ${REPO} \n"
+#				#printf ${REPO}
+#			done < ignore.txt
 
 		elif [ "$ADD_REMOTE" = "YES" ]; then
 			git remote add -f --no-tags remote--${REMOTE} https://github.com/${REPO}.git
@@ -123,29 +126,29 @@ else
 						n=${j##*/}
 						if [ $n != "__unported__" ]; then
 							if [ -h ${SYMLINKS_PATH}/$n ]; then
-								printf "symlink exists '${REPO}/$n'"
+								printf "symlink exists '${REPO}/$n'\n"
 								if [ "$ADD_REMOTE" = "YES" ]; then
-									NOT_ADDED_REPOS="$NOT_ADDED_REPOS\n${REPO}/$n\n"
+									NOT_ADDED_REPOS="$NOT_ADDED_REPOS\n${REPO}/$n"
 								fi
 							else
-								printf "create symlink 1: '${REPO}/$n'"
+								printf "create symlink 1: '${REPO}/$n'\n"
 								ln -s "../../${PATH_PREFIX}/${REPO}/$n" "${SYMLINKS_PATH}/$n"
 							fi
 							if [ -h ${ADHOC_PATH}/$n ]; then
-								printf "delete adhoc"
+								printf "delete adhoc\n"
 								rm ${ADHOC_PATH}/$n
 							fi
 						fi
 					fi
 				done
 			elif [ "$CREATE_LINKS" = 2 ]; then
-				printf "create symlink 2: '${REPO}/'"
+				printf "create symlink 2: '${REPO}/'\n"
 				REPO_SEP=($(printf "$REPO" | tr "/" "\n"))
 				if [ ${REPO_SEP[1]} ]; then
 					REPO=${REPO_SEP[1]}
 					PATH_PREFIX+="/${REPO_SEP[0]}"
 				fi
-				ln -s ../${PATH_PREFIX}/${REPO} ${SYMLINKS_PATH}/${REPO}
+				ln -s "../../${PATH_PREFIX}/${REPO}" "${SYMLINKS_PATH}/${REPO}"
 				PATH_PREFIX=".repos"
 			elif [ "$CREATE_LINKS" = 3 ]; then
 				ln -s ${SYMLINKS_PATH}/${REPO} ${PATH_START}/
@@ -154,16 +157,22 @@ else
 			fi
 			CREATE_LINKS=1
 		fi
-		printf "..................................................DONE................................................."
+		
+		REMOTE_BRANCH=${MAIN_BRANCH}
+		
+		printf "..................................................DONE.................................................\n\n"
 	done
+
 	if [ "$UPDATE" = "1" ]; then
 		printf 'Repos updated:\n---------------\n' + "$ADDED_REPOS" + '\n'
 	elif [ "$ADDED_REPOS" != "" ]; then
 		printf "$ADDED_REPOS\n" >> ADD.md
 	fi
+
 	if [ "$NOT_ADDED_REPOS" != "" ]; then
 		printf "$NOT_ADDED_REPOS" >> exists.txt
 	fi
+
 	find -name "*.pyc" -delete
 	find -name "*.pyo" -delete
 	find -name "*.pyd" -delete
@@ -186,4 +195,4 @@ else
 	find -name "__MACOSX" -exec rm -r "{}" \;
 	find -name "__pycache__" -exec rm -r "{}" \;
 	find -name "develop-eggs" -exec rm -r "{}" \;
-fi
\ No newline at end of file
+fi
-- 
2.0.0