improve build.sh

set $VERSION and $TARGETS only if the repos are checked out already
copy all modules out of src/output/modules/ and not only gluon-ffho-${VERSION}/

build.sh

@@ -54,7 +54,7 @@ pushd ${MY_DIR} > /dev/null
 
 ### set reasonable defaults for unset environment variables
 [ -n "${AUTOUPDATER}" ] || AUTOUPDATER=${BRANCH}
-# ToDo: [ "${BASE}" == "master" ] && BASE="origin/master"
+# TODO: [ "${BASE}" == "master" ] && BASE="origin/master"
 if [ -n "${BROKEN}" ]; then
 	if [ "${BROKEN}" -eq "1" ]; then
 		export BROKEN
@@ -78,16 +78,6 @@ fi
 [ -n "${SITE_REPO_FETCH_METHOD}" ] || SITE_REPO_FETCH_METHOD="http"
 [ -n "${VERBOSE}" ] || VERBOSE=0
 
-if [ -z "${TARGETS}" ]; then
-        TARGETS=$(make list-targets | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
-        info "building all tagets: '${TARGETS}'"
-fi
-if [ "${BRANCH}" == "experimental" -a -z "${VERSION}" ] ; then
-	VERSION=$(make default-release)
-	info "EXPERIMENTAL FIRMWARE: using version tag '${VERSION}'"
-fi
-
-### set some additional variables
 if [ "${SITE_REPO_FETCH_METHOD}" != "git" ]; then
 	SITE_REPO_URL="https://${SITE_REPO_URL}"
 else
@@ -166,6 +156,15 @@ progress "Preparing the build environment (make update) ..."
 make update
 [ "$?" -eq "0" ] || abort "Failed to update the build environment, mimimi."
 
+### set reasonable defaults for ${TARGETS} and ${BRANCH} if unset
+if [ -z "${TARGETS}" ]; then
+        TARGETS=$(make list-targets | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
+        info "building all tagets: '${TARGETS}'"
+fi
+if [ "${BRANCH}" == "experimental" -a -z "${VERSION}" ] ; then
+        VERSION=$(make default-release)
+        info "EXPERIMENTAL FIRMWARE: using version tag '${VERSION}'"
+fi
 
 # we are now ready to produce the firmware images, so let's "save" our state
 build_info_path="${OUTPUT_DIR}/${BRANCH}/${BUILD_INFO_FILENAME}"
@@ -239,7 +238,7 @@ popd > /dev/null #${IMAGE_DIR}
 progress "Assembling modules.7z ..."
 pushd ${MODULE_DIR} > /dev/null
 [ -e "${OUTPUT_DIR}/${BRANCH}/modules.7z" ] && rm "${OUTPUT_DIR}/${BRANCH}/modules.7z"
-7z a -mmt=on "${OUTPUT_DIR}/${BRANCH}/modules.7z" ./gluon-ffho-${VERSION} > /dev/null
+7z a -mmt=on "${OUTPUT_DIR}/${BRANCH}/modules.7z" ./* > /dev/null
 [ "$?" -eq "0" ] || abort "Failed to assemble modules."
 popd > /dev/null #${MODULE_DIR}