[buildtree/util-pkgtree] clean up code

bin/buildtree.in

@@ -89,6 +89,6 @@ ${pretend} && display_settings && exit 1
 
 ${clean} && clean_dir "${tree_dir}" && exit 1
 
-${sync} && sync_tree
+${sync} && sync_tree_manjaro
 
 ${abs} && sync_tree_abs

lib/util-pkgtree.sh

@@ -10,45 +10,43 @@
 # GNU General Public License for more details.
 
 sync_tree(){
+	if [ "$(git log --pretty=%H ...refs/heads/master^)" = "$(git ls-remote origin -h refs/heads/master |cut -f1)" ]; then
+		msg "[$1]" && msg2 "up to date"
+	else
+		msg "[$1]" && msg2 "sync"
+		git pull origin master
+	fi
+}
+
+clone_tree(){
+	msg "[$1]" && msg2 "clone"
+	git clone $2.git
+}
+
+sync_tree_manjaro(){
 	cd ${tree_dir}
 	for repo in ${repo_tree[@]};do
 		if [[ -d packages-${repo} ]];then
 			cd packages-${repo}
-				if [ "$(git log --pretty=%H ...refs/heads/master^)" = "$(git ls-remote origin -h refs/heads/master |cut -f1)" ]; then
+				sync_tree "${repo}"
-					msg "[${repo}]"
-					msg2 "up to date"
-				else
-					msg "Syncing ..."
-					msg2 "[${repo}]"
-					git pull origin master
-				fi
 			cd ..
 		else
-			msg "Cloning ..."
+			clone_tree "${host_tree}/packages-${repo}"
-			msg2 "[${repo}]"
-			git clone ${host_tree}/packages-${repo}.git
 		fi
 	done
 	cd ..
 }
 
 sync_tree_abs(){
-	cd ${tree_dir}/abs
+	local repo=abs
-	if [[ -d packages ]];then
+	cd ${tree_dir}/${repo}
-		cd packages
+		if [[ -d packages ]];then
-			if [ "$(git log --pretty=%H ...refs/heads/master^)" = "$(git ls-remote origin -h refs/heads/master |cut -f1)" ]; then
+			cd packages
-				msg "[abs]"
+				sync_tree "${repo}"
-				msg2 "up to date"
+			cd ..
-			else
+
-				msg "Syncing ..."
+		else
-				msg2 "[abs]"
+			clone_tree "${host_tree_abs}"
-				git pull origin master
+		fi
-			fi
-		cd ..
-	else
-		msg "Cloning ..."
-		msg2 "[abs]"
-		git clone ${host_tree_abs}.git
-	fi
 	cd ..
 }