From cd65e27f8ce47bdfff09cfdb8156a251f0c7cafb Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 26 Jan 2009 10:30:25 +0000
Subject: abuild: make color work again

by sourcing the functions.sh after abuild.conf
---
 abuild | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/abuild b/abuild
index 36223f8..22803ee 100755
--- a/abuild
+++ b/abuild
@@ -10,20 +10,6 @@
 
 abuild_ver=1.5
 
-# source functions
-# if abuild was not run from PATH, then look for func lib at same location
-if [ -z "$FUNCLIB" ]; then
-	FUNCLIB="${0##/*}/functions.sh"
-	[ -f "$FUNCLIB"	] || FUNCLIB=/usr/share/abuild/functions.sh
-fi
-
-if ! [ -f "$FUNCLIB" ]; then
-	echo "$FUNCLIB: not found" >&2
-	exit 1
-fi
-. "$FUNCLIB"
-	
-
 startdir="$PWD"
 srcdir=${srcdir:-"$startdir/src"}
 pkgdir=${pkgdir:-"$startdir/pkg"}
@@ -47,6 +33,19 @@ if [ -n "$REPODEST" ]; then
 	PKGDEST="$REPODEST/$repo"
 fi
 
+# source functions
+# if abuild was not run from PATH, then look for func lib at same location
+if [ -z "$FUNCLIB" ]; then
+	FUNCLIB="${0##/*}/functions.sh"
+	[ -f "$FUNCLIB"	] || FUNCLIB=/usr/share/abuild/functions.sh
+fi
+
+if ! [ -f "$FUNCLIB" ]; then
+	echo "$FUNCLIB: not found" >&2
+	exit 1
+fi
+. "$FUNCLIB"
+	
 set_xterm_title() {
 	if [ "$TERM" = xterm ]; then
 		 printf "\033]0;$1\007" >&2
-- 
cgit v1.2.3-70-g09d2