Improvements to setup scripts

- use the already fetched .repo/repo as a workaround for repo tool's
mandatory -u argument
- rename environment-setup.sh script
- Add notice about correctly sourcing the environment-setup.sh script

Change-Id: I4ac3cf26ca30ae1c14474cf9fb15e65ebc0be3ac
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>

2 files changed, 20 insertions, 28 deletions

diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index 2deb8a4..0fa07ba 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -120,7 +120,7 @@ mirror() {
   mkdir -p .repo/manifests
   cp ${DIR}/scripts/manifest.xml .repo/manifests/
   MANIFEST="manifest.xml"
-  ${REPO} init -u https://gerrit.googlesource.com/git-repo -m ${MANIFEST} -g all --mirror
+  ${REPO} init -u .repo/repo -m ${MANIFEST} -g all --mirror
   ${REPO} sync
 }
 
@@ -139,14 +139,14 @@ init() {
   else
     MANIFEST="manifest.xml"
   fi
-  ${REPO} init -u https://gerrit.googlesource.com/git-repo -m ${MANIFEST} -g "${GROUPS}" ${REFERENCE}
+  ${REPO} init -u .repo/repo -m ${MANIFEST} -g "${GROUPS}" ${REFERENCE}
   ${REPO} sync
 
   if [ ! -e "sources/meta-b2qt" ]; then
     ln -s ${DIR} sources/meta-b2qt
   fi
 
-  cp ${DIR}/scripts/setup_environment.sh .
+  cp ${DIR}/scripts/setup-environment.sh .
 
 }
 
diff --git a/scripts/setup_environment.sh b/scripts/setup-environment.sh
index aaba070..2ff9e29 100755
--- a/scripts/setup_environment.sh
+++ b/scripts/setup-environment.sh
@@ -21,22 +21,10 @@
 ##
 #############################################################################
 
-usage() {
-  echo "source setup-environment <build-dir>"
-}
-
-clean() {
-  unset BUILDDIR
-  unset TEMPLATECONF
-  unset LAYERSCONF
-}
-
-CWD=`pwd`
-
 while test -n "$1"; do
   case "$1" in
     "--help" | "-h")
-      usage
+      echo "Usage: . $0 [build directory]"
       return 0
       ;;
     *)
@@ -46,18 +34,20 @@ while test -n "$1"; do
   shift
 done
 
-if [ -z "${BUILDDIR}" ]; then
-  usage
-  return 1
+THIS_SCRIPT="setup-environment.sh"
+if [ "$(basename $0)" = "${THIS_SCRIPT}" ]; then
+    echo "Error: This script needs to be sourced. Please run as '. $0'"
+    exit 1
 fi
 
+BUILDDIR=${BUILDDIR:-build-${MACHINE}}
+
 if [ -z "$MACHINE" ]; then
-  echo "MACHINE environment variable not defined"
-  clean
+  echo "Error: MACHINE environment variable not defined"
   return 1
 fi
 
-if [ ! -f ${CWD}/${BUILDDIR}/conf/bblayers.conf ]; then
+if [ ! -f ${PWD}/${BUILDDIR}/conf/bblayers.conf ]; then
   case ${MACHINE} in
     apalis-imx6)
       LAYERSCONF="bblayers.conf.toradex.sample"
@@ -83,11 +73,13 @@ if [ ! -f ${CWD}/${BUILDDIR}/conf/bblayers.conf ]; then
     ;;
   esac
 
-  mkdir -p ${CWD}/${BUILDDIR}/conf
-  cp ${CWD}/sources/meta-b2qt/conf/${LAYERSCONF} ${CWD}/${BUILDDIR}/conf/bblayers.conf
+  mkdir -p ${PWD}/${BUILDDIR}/conf
+  cp ${PWD}/sources/meta-b2qt/conf/${LAYERSCONF} ${PWD}/${BUILDDIR}/conf/bblayers.conf
 fi
 
-export TEMPLATECONF=${CWD}/sources/meta-b2qt/conf
-cd sources/poky
-. ./oe-init-build-env ${CWD}/${BUILDDIR}
-clean
+export TEMPLATECONF="${PWD}/sources/meta-b2qt/conf"
+. sources/poky/oe-init-build-env ${BUILDDIR}
+
+unset BUILDDIR
+unset TEMPLATECONF
+unset LAYERSCONF