scripts/mkefi-agl.sh: fix cleanup

[AGL/meta-agl.git] / scripts / .aglsetup_genconfig.bash

diff --git a/scripts/.aglsetup_genconfig.bash b/scripts/.aglsetup_genconfig.bash
index 285ecee..d4f3ba8 100755 (executable)
--- a/scripts/.aglsetup_genconfig.bash
+++ b/scripts/.aglsetup_genconfig.bash
@@ -67,6 +67,13 @@ function list_all_machines() {
        done
 }
 
+function validate_builddir() {
+       if [[ "$BUILDDIR" =~ [[:space:]] ]]; then
+               error "Build dir '$BUILDDIR' shouldn't contain any space"
+       fi
+       debug "Build dir is valid"
+}
+
 function validate_machines() {
        list_all_machines | sort | uniq -c | while read cnt machine; do
                [[ $cnt == 1 ]] && continue
@@ -206,7 +213,7 @@ function append_fragment() {
 function execute_setup() {
        script=$1
        debug "Executing script $script"
-       opts=
+       opts="-e"
        [[ $DEBUG == 1 ]] && opts="$opts -x"
        pushd $BUILDDIR &>/dev/null
                $BASH $opts $script \
@@ -324,8 +331,8 @@ for FEATURE in $FEATURES;do
     TMP_FEATURES="$TMP_FEATURES $FEATURE"
     TMP_FEATURES="$TMP_FEATURES $(find_feature_dependency $FEATURE $TMP_FEATURES)"
 done
-FEATURES=$TMP_FEATURES
-echo "Features used: $FEATURES"
+# remove duplicate features if any
+FEATURES=$(for x in $TMP_FEATURES; do echo $x; done | sort -u | awk '{printf("%s ",$1);}')
 
 # validate the features
 for f in $FEATURES; do
@@ -335,7 +342,8 @@ done
 
 # validate build dir
 debug "validating builddir $BUILDDIR"
-BUILDDIR=$(mkdir -p $BUILDDIR && cd $BUILDDIR && pwd -P)
+BUILDDIR=$(mkdir -p "$BUILDDIR" && cd "$BUILDDIR" && pwd -P)
+validate_builddir
 
 ###########################################################################################
 function dump_log() {