Fixed indentation

1 files changed, 188 insertions, 159 deletions

diff --git a/fullpkg b/fullpkg
index a80f962..213bf5e 100755
--- a/fullpkg
+++ b/fullpkg
@@ -97,13 +97,15 @@ guess_repo() {
 # cleans the build_dir
 function cleanup {
     if [ ! -d $build_dir ]; then
-	return 1
+        return 1
+
     elif [ -d $build_dir -a ${#@} -gt 0 ]; then
-	for _dir in $@; do
-	    rm -rf $build_dir/$_dir/
-	done
+        for _dir in $@; do
+            rm -rf $build_dir/$_dir/
+        done
+
     else
-	rm -rf $build_dir/*
+        rm -rf $build_dir/*
     fi
 }
 
@@ -114,66 +116,73 @@ function find_deps {
     source PKGBUILD
     local repo=${repo:-$(guess_repo)}
 
-    # If package is built exit
-    # TODO?: If this package is in force_build: skip this step
+# If package is built exit
+# TODO?: If this package is in force_build: skip this step
     if is_built "${pkgbase:-${pkgname[0]}}>=${pkgver}-${pkgrel}"; then
-	exit 0
+        exit 0
     fi
 
-    # Tell which packages are deeper in deps (even if they are on build_dir)
-    # so we can build them first.
+# Tell which packages are deeper in deps (even if they are on build_dir)
+# so we can build them first.
     echo "${level}:$(basename $PWD)" >> "${build_dir}/BUILDORDER"
 
-    # if pkgbuild directory is on build_dir, do not copy and exit
+# if pkgbuild directory is on build_dir, do not copy and exit
     if [ -d "${build_dir}/$(basename $PWD)" ]; then
-	exit 0
+        exit 0
     else
-	cp -r ../$(basename $PWD) ${build_dir}/
-	# Info to eval later
-	echo "repo=$repo" > "${build_dir}/$(basename $PWD)/.INFO"
+        cp -r ../$(basename $PWD) ${build_dir}/
+# Info to eval later
+        echo "repo=$repo" > "${build_dir}/$(basename $PWD)/.INFO"
     fi
     
     msg2 "${pkgbase:-${pkgname[0]}}>=${pkgver}-${pkgrel}"
 
-    ## Check next levels
-    # Clean version checking
+## Check next levels
+# Clean version checking
     deps=$(echo "${depends[@]} ${makedepends[@]}" | \
-	sed "s/[=<>]\+[^ ]\+//g" | \
-	tr ' ' "\n" | \
-	sort -u)
+           sed "s/[=<>]\+[^ ]\+//g" | \
+           tr ' ' "\n" | \
+           sort -u)
+
+# Increase build level
     declare -i next_level=$level+1
     
     for _dep in ${deps[@]}; do
-	for _repo in ${REPOS[@]}; do
-	    # try to find $_dep on each repo from dirname
-	    if [ -e "$ABSROOT/${_repo}/$_dep/PKGBUILD" ]; then
-		pushd "$ABSROOT/${_repo}/$_dep" > /dev/null
-		$0 -c -d ${build_dir} -l ${next_level}
-		# Circular deps must fail
-		[ $? -eq 20 ] && return 20
-		popd > /dev/null
-		break 1 # found, go to next dep
-	    # if search pkgname in repo doesn't work
-	    # this should find pkgsplits
-	    elif _dir=($(find "$ABSROOT/${_repo}" -type f -name PKGBUILD -print0 | \
-		"xargs" -0 -e grep -HEw "pkgname|pkgbase|provides" | grep $_dep 2>&1));
-	    then
-		pushd $(dirname $(echo $_dir | cut -d: -f1)) > /dev/null
-		$0 -c -d ${build_dir} -l ${next_level}
-		# Circular deps must fail
-		[ $? -eq 20 ] && return 20
-		popd > /dev/null
-		break 1 # found, go to next dep
-	    else
-		echo "dep_not_found:$_dep:$_repo" >> $build_dir/log
-	    fi
-	done
+        for _repo in ${REPOS[@]}; do
+            # try to find $_dep on each repo from dirname
+            if [ -e "$ABSROOT/${_repo}/$_dep/PKGBUILD" ]; then
+                pushd "$ABSROOT/${_repo}/$_dep" > /dev/null
+                $0 -c -d ${build_dir} -l ${next_level}
+
+                # Circular deps must fail
+                [ $? -eq 20 ] && return 20
+                popd > /dev/null
+                break 1 # found, go to next dep
+
+# if search pkgname in repo doesn't work
+# this should find pkgsplits
+            elif _dir=($(find "$ABSROOT/${_repo}" -type f -name PKGBUILD -print0 | \
+            "xargs" -0 -e grep -HEw "pkgname|pkgbase|provides" | grep $_dep 2>&1));
+            then
+                pushd $(dirname $(echo $_dir | cut -d: -f1)) > /dev/null
+                $0 -c -d ${build_dir} -l ${next_level}
+# Circular deps must fail
+                [ $? -eq 20 ] && return 20
+                popd > /dev/null
+                break 1 # found, go to next dep
+
+            else
+                echo "dep_not_found:$_dep:$_repo" >> $build_dir/log
+
+            fi
+        done
     done
+
     unset next_level dir
     # unset PKGBUILD variables
     unset pkgname pkgver pkgrel epoch pkgdesc arch url license groups depends \
-	makedepens checkdepends optdepends provides conflicts replaces backup \
-	options install changelog source noextract md5sums build check package
+          makedepens checkdepends optdepends provides conflicts replaces backup \
+          options install changelog source noextract md5sums build check package
 }
 
 function _pkg_build () {
@@ -181,88 +190,102 @@ function _pkg_build () {
     # packages to build are on $buildorder
     # greater levels must be built first
     build_packages=($(sort -gr $buildorder | cut -d: -f2))
+
     while [ ${#build_packages[@]} -ge 1 ]; do
-	pushd $build_dir/${build_packages[0]} > /dev/null
-	source PKGBUILD 
-	msg2 "${pkgbase:-${pkgname[0]}} $pkgver-$pkgrel"
-	# Add mips64el
-	if ! grep mips64el PKGBUILD >/dev/null; then
-	    plain "Adding mips64el arch"
-	    sed -i "s/^\(arch=([^)anym]\+\))/\1 'mips64el')/" "PKGBUILD"
-	fi
-        # Check if pkg is being built
-	msg2 "Checking build queue"
-	check_queue || {
-	    echo "someone_is_building:$(basename $PWD)" >> $build_dir/log
-	    grep -vwh "$(basename $PWD)" $buildorder > $buildorder.2
-	    mv $buildorder.2 $buildorder
-	    continue
-	}
-	# Let everybody know we're building this.
-	msg2 "Updating build queue"
-	update_queue || {
-	    warning "Couldn't update the queue, let your partners know about this."
-	}
-	msg2 "Checking for non free deps"
-	pkgbuild-check-nonfree || {
-	    # pkgbuild-check-nonfree fails with 15 if there are nonfree deps,
-	    # fails with something else if blacklist can't be retrieved
-	    if [ $? -eq 15 ]; then
-		# log they have nonfree deps and so didn't build
-		echo "nonfree:$(basename $PWD)" >> $build_dir/log
-		# take out package from $buildorder
-		grep -vwh "$(basename $PWD)" $buildorder > $buildorder.2
-		mv $buildorder.2 $buildorder
-		# continue building next package
-		continue
-	    fi
-	}
-	msg2 "Building $(basename $PWD)"
-	# this buildcmd is on libretools.conf
-	$FULLBUILDCMD; r=$?
-	case $r in
-	    0) plain "The build was succesful."
-		source .INFO && [ -n $repo ] && {
-		    librestage $repo || {
-			echo "unstaged:$(basename $PWD)" >> $build_dir/log
-		    }
-		}
-		echo "built:$(basename $PWD)" >> $build_dir/log
-		cleanup "$(basename $PWD)" 
-		;;
-	    1) error "There were errors while trying to build the package." 
-		echo "failed:$(basename $PWD)" >> $build_dir/log
-		;;
-	    2) error "The build failed."
-		echo "failed:$(basename $PWD)" >> $build_dir/log
-		;;
-	esac
-	# Package was built or failed: take it out of $buildorder
-	grep -vwh "${build_packages[0]}" $buildorder > $buildorder.2
-	mv $buildorder.2 $buildorder
-	# Take package out from queue
-	remove_queue
-	# Set build_packages before next cycle run
-	build_packages=($(sort -gr $buildorder | cut -d: -f2))
-	popd > /dev/null
+        pushd $build_dir/${build_packages[0]} > /dev/null
+        source PKGBUILD 
+
+        msg2 "${pkgbase:-${pkgname[0]}} $pkgver-$pkgrel"
+# Add mips64el
+        if ! grep mips64el PKGBUILD >/dev/null; then
+            plain "Adding mips64el arch"
+            sed -i "s/^\(arch=([^)anym]\+\))/\1 'mips64el')/" "PKGBUILD"
+        fi
+
+# Check if pkg is being built
+        msg2 "Checking build queue"
+        check_queue || {
+            echo "someone_is_building:$(basename $PWD)" >> $build_dir/log
+            grep -vwh "$(basename $PWD)" $buildorder > $buildorder.2
+            mv $buildorder.2 $buildorder
+            continue
+        }
+
+# Let everybody know we're building this.
+        msg2 "Updating build queue"
+        update_queue || {
+            warning "Couldn't update the queue, let your partners know about this."
+        }
+
+        msg2 "Checking for non free deps"
+        pkgbuild-check-nonfree || {
+# pkgbuild-check-nonfree fails with 15 if there are nonfree deps,
+# fails with something else if blacklist can't be retrieved
+            if [ $? -eq 15 ]; then
+# log they have nonfree deps and so didn't build
+            echo "nonfree:$(basename $PWD)" >> $build_dir/log
+# take out package from $buildorder
+            grep -vwh "$(basename $PWD)" $buildorder > $buildorder.2
+            mv $buildorder.2 $buildorder
+# continue building next package
+            continue
+            fi
+        }
+
+        msg2 "Building $(basename $PWD)"
+# this buildcmd is on libretools.conf
+        $FULLBUILDCMD; r=$?
+        case $r in
+            0) plain "The build was succesful."
+            source .INFO && [ -n $repo ] && {
+                librestage $repo || {
+                echo "unstaged:$(basename $PWD)" >> $build_dir/log
+                }
+            }
+            echo "built:$(basename $PWD)" >> $build_dir/log
+            cleanup "$(basename $PWD)" 
+            ;;
+            1) error "There were errors while trying to build the package." 
+            echo "failed:$(basename $PWD)" >> $build_dir/log
+            ;;
+            2) error "The build failed."
+            echo "failed:$(basename $PWD)" >> $build_dir/log
+            ;;
+        esac
+
+# Package was built or failed: take it out of $buildorder
+        grep -vwh "${build_packages[0]}" $buildorder > $buildorder.2
+        mv $buildorder.2 $buildorder
+
+# Take package out from queue
+        remove_queue
+
+# Set build_packages before next cycle run
+        build_packages=($(sort -gr $buildorder | cut -d: -f2))
+        popd > /dev/null
     done
+
     pkgs=$(cat $build_dir/log | grep "nonfree:") && {
-	error "Those packages contain nonfree deps:"
-	echo ${pkgs[@]} | tr " " "\n" | cut -d: -f2
+        error "Those packages contain nonfree deps:"
+        echo ${pkgs[@]} | tr " " "\n" | cut -d: -f2
     }
+
     pkgs=$(cat $build_dir/log | tr " " "\n" | grep "built:") && {
-	error "Those packages were built and installed:"
-	echo ${pkgs[@]} | tr " " "\n" | cut -d: -f2
-	msg "Uploading packages to the server"
+        error "Those packages were built and installed:"
+        echo ${pkgs[@]} | tr " " "\n" | cut -d: -f2
+        msg "Uploading packages to the server"
     }
+
     pkgs=$(cat $build_dir/log | tr " " "\n" | grep "failed:") && {
-	error "Those packages failed to build:"
-	echo ${pkgs[@]} | tr " " "\n" | cut -d: -f2
+        error "Those packages failed to build:"
+        echo ${pkgs[@]} | tr " " "\n" | cut -d: -f2
     }
+
     pkgs=$(cat $build_dir/log | tr " " "\n" | grep "unstaged:") && {
-	error "Those packages couldn't be staged because of missing reponame:"
-	echo ${pkgs[@]} | tr " " "\n" | cut -d: -f2
+        error "Those packages couldn't be staged because of missing reponame:"
+        echo ${pkgs[@]} | tr " " "\n" | cut -d: -f2
     }
+
     popd > /dev/null
 }
 ## END FUNCTIONS ##
@@ -276,52 +299,57 @@ do_cleanup='n'
 max_level=21
 while getopts 'ha:bcCd:l:nm:r:' arg; do
     case $arg in
-	h) usage; exit 0 ;;
-	a) ABSROOT="$OPTARG" ;;
-	b) build_only='y' ;;
-	c) check_deps_only='y' ;;
-	C) do_cleanup='y';;
-	# f) force_build+="-f pkgname " ;;
-	d) build_dir="$OPTARG" ;;
-	# hidden option to know what to build first.
-	# if $level > 0 it will not build
-	l) level=$OPTARG ;;
-	n) noupdate='y';;
-	m) max_level=$OPTARG ;;
-	r) FULLBUILDCMD="$OPTARG" ;;
+        h) usage; exit 0 ;;
+        a) ABSROOT="$OPTARG" ;;
+        b) build_only='y' ;;
+        c) check_deps_only='y' ;;
+        C) do_cleanup='y';;
+        # f) force_build+="-f pkgname " ;;
+        d) build_dir="$OPTARG" ;;
+# hidden option to know what to build first.
+# if $level > 0 it will not build
+        l) level=$OPTARG ;;
+        n) noupdate='y';;
+        m) max_level=$OPTARG ;;
+        r) FULLBUILDCMD="$OPTARG" ;;
     esac
 done
 
 # Only on level 0
 [ $level -eq 0 ] && {
-    # if build_dir exist use it, else make a build_dir
+# if build_dir exist use it, else make a build_dir
     build_dir=${build_dir:-$(mktemp -d /tmp/fullpkg.XXXXXX)}
-    # cleanup if the option was used.
+
+# cleanup if the option was used.
     [ $do_cleanup == 'y' ] && {
-	cleanup
-	[ $build_only == 'y' ] && exit 0
+        cleanup
+        [ $build_only == 'y' ] && exit 0
     }
-    # set queue_file and ban_file
+
+# set queue_file and ban_file
     mkdir -p $XDG_CONFIG_HOME/libretools
     queue_file=$XDG_CONFIG_HOME/libretools/queue
     ban_file=$XDG_CONFIG_HOME/libretools/ban
-    # make files for log and buildorder
+
+# make files for log and buildorder
     touch $build_dir/{log,BUILDORDER}
     buildorder=$build_dir/BUILDORDER
 
     [ $noupdate = 'n' ] && {
-	msg "Updating pacman db and packages"
-	sudo pacman -Syu --noconfirm
+        msg "Updating pacman db and packages"
+        sudo pacman -Syu --noconfirm
     }
-    # Build only
+
+# Build only
     [ $build_only == 'y' ] && {
-	# Exit loop on Ctrl+C
-	trap "break" INT
-        # Remove from queue package being built on error
-	trap "remove_queue" EXIT INT QUIT TERM KILL
-	_pkg_build
-	exit 0
+# Exit loop on Ctrl+C
+        trap "break" INT
+# Remove from queue package being built on error
+        trap "remove_queue" EXIT INT QUIT TERM KILL
+        _pkg_build
+        exit 0
     }
+
     msg "Checking dependencies"
 }
 
@@ -338,8 +366,8 @@ find_deps || {
     # if find_deps finds circular deps
     # it should exit with status 20
     [ $? -eq 20 ] && {
-	# only show message on level 0
-	[ $level -eq 0 ] && error "Check for circular deps on $build_dir/BUILDORDER";
+        # only show message on level 0
+        [ $level -eq 0 ] && error "Check for circular deps on $build_dir/BUILDORDER";
     }
     exit 20
 }
@@ -351,18 +379,19 @@ find_deps || {
 [ $level -eq 0 -a -d $build_dir ] && {
     # Check for banned deps
     if [ -w $ban_file -a -r $ban_file ]; then
-	chmod o+rw $ban_file || error "Ban file is not readable/writable ($ban_file)"
+        chmod o+rw $ban_file || error "Ban file is not readable/writable ($ban_file)"
+
     else
-	rsync -e ssh -aq $PARABOLAHOST:mips64el/ban >/dev/null 2>&1 || {
-	    warning "Failed to get ban list" && [ -r $ban_file ] && {
-	        # continue if download failed but local copy
-		search=$(cat $ban_file | tr "\n" "|")
-		echo ${@} | tr " " "\n" | egrep -w "$search" $buildorder >> $build_dir/banned
-		echo ${@} | tr " " "\n" | egrep -vw "$search" $buildorder > $buildorder.2
-		mv $buildorder.2 $buildorder
-		unset search
-	    }
-	}
+        rsync -e ssh -aq $PARABOLAHOST:mips64el/ban >/dev/null 2>&1 || {
+            warning "Failed to get ban list" && [ -r $ban_file ] && {
+                # continue if download failed but local copy
+            search=$(cat $ban_file | tr "\n" "|")
+            echo ${@} | tr " " "\n" | egrep -w "$search" $buildorder >> $build_dir/banned
+            echo ${@} | tr " " "\n" | egrep -vw "$search" $buildorder > $buildorder.2
+            mv $buildorder.2 $buildorder
+            unset search
+            }
+        }
     fi
 }