Merge branch 'master' into xbs

Conflicts:
	src/lib/conf.sh

1 files changed, 7 insertions, 7 deletions

diff --git a/src/fullpkg/fullpkg-build b/src/fullpkg/fullpkg-build
index 8149453..e824c2e 100755
--- a/src/fullpkg/fullpkg-build
+++ b/src/fullpkg/fullpkg-build
@@ -45,13 +45,13 @@ remove_buildorder() {
 
 succesfull_build() {
 
-	if [ "$RUN" != "$FULLBUILDCMD" ]; then
+	if [[ "$RUN" != "$FULLBUILDCMD" ]]; then
 		return 0 # Custom command or download sources
 	fi
 
-	if source .INFO && [ -n "$repo" ]; then
+	if source .INFO && [[ -n "$repo" ]]; then
 
-		if [ ! -z "$HOOKLOCALRELEASE" ]; then
+		if [[ ! -z "$HOOKLOCALRELEASE" ]]; then
 			"$HOOKLOCALRELEASE" "$repo"
 		fi
 
@@ -75,11 +75,11 @@ __build() {
 
 	build_packages=($(sort -gr $buildorder | cut -d: -f2)) # greater levels must be built first
 
-	while [ ${#build_packages[@]} -ge 1 ]; do
+	while [[ ${#build_packages[@]} -ge 1 ]]; do
 
 		pushd "$build_dir/${build_packages[0]}" >/dev/null
 
-		if [ -n "${HOOKPKGBUILDMOD}" ]; then
+		if [[ -n "${HOOKPKGBUILDMOD}" ]]; then
 			${HOOKPKGBUILDMOD} || true
 		fi
 
@@ -156,7 +156,7 @@ shift $(( OPTIND - 1 ))
 build_dir="${1:-`pwd`}"
 buildorder="${build_dir}/BUILDORDER"
 
-if [ ! -e "$buildorder" ]; then
+if [[ ! -e "$buildorder" ]]; then
 	error "This is not a build_dir. Make one using fullpkg."
 	usage
 	exit 1
@@ -172,7 +172,7 @@ fi
 msg "$MESSAGE"
 __build
 
-if [ "$RUN" != "$FULLBUILDCMD" ]; then
+if [[ "$RUN" != "$FULLBUILDCMD" ]]; then
 	# Used for downloading or custom command
 	mv "$build_dir/.BUILDORDER" "$buildorder"
 	exit 0