Update corresponding scripts

Makefile

@@ -0,0 +1,13 @@
+all:
+
+LC_ALL:=C
+LANG:=C
+export LC_ALL LANG
+
+GLUONDIR:=${CURDIR}/src
+
+include $(GLUONDIR)/include/gluon.mk
+include $(GLUONDIR)/targets/targets.mk
+
+list-targets:
+	@echo '$(GLUON_TARGETS)'

build-version.sh

@@ -1,50 +1,49 @@
 #!/bin/bash
-# (c) 2014-2015 Freifunk Paderborn <maschinenraum@paderborn.freifunk.net>
+# (c) 2014-2016 Freifunk Hochstift <kontakt@hochstift.freifunk.net>
 #
 # calls build.sh with information found in given version
 
 MY_DIR=$(dirname $0)
-MY_DIR=$(readlink -f "$MY_DIR")
-pushd $MY_DIR > /dev/null
+MY_DIR=$(readlink -f "${MY_DIR}")
+pushd ${MY_DIR} > /dev/null
 
 . functions.sh
 
 version=$1
 versionfile="${MY_DIR}/versions/${version}"
-[ -r $versionfile ] || abort "Failed to find the version '$version'."
+[ -r ${versionfile} ] || abort "Failed to find the version '${version}'."
 
 [ -n "${BROKEN}" ] || BROKEN=0
-base=`awk 'BEGIN { FS="=" } /^GLUON=([a-f0-9]+)(\s*#.+)?$/ { print $2; }' $versionfile | awk 'BEGIN { FS="#" } { print $1; }'`
-branch=`awk 'BEGIN { FS="=" } /^BRANCH=([a-z]+)$/ { print $2; }' $versionfile`
-version=`awk 'BEGIN { FS="=" } /^VERSION=([0-9\.\-+~a-z]+)$/ { print $2; }' $versionfile`
-site_repo=`awk 'BEGIN { FS="=" } /^SITE_REPO=([a-z]+)$/ { print $2; }' $versionfile`
-site=`awk 'BEGIN { FS="=" } /^SITE=([a-f0-9]+)(\s*#.+)?$/ { print $2; }' $versionfile | awk 'BEGIN { FS="#" } { print $1; }'`
-targets=`awk 'BEGIN { FS="=" } /^TARGETS=.+$/ { print $2; }' $versionfile`
-ts=`awk 'BEGIN { FS="=" } /^TS=.+$/ { print $2; }' $versionfile`
-
-[ -z "$base" ] && abort "Failed to parse Gluon base commit-id from version file."
-[ -z "$branch" ] && abort "Failed to parse branch name from version file."
-[ -z "$version" ] && abort "Failed to parse version from version file."
-[ -z "$site_repo" ] && site_repo="ffpb"
-[ -z "$site" ] && abort "Failed to parse site repo commit-id from version file."
-[ -z "$ts" ] && abort "Failed to parse timestamp from version file."
+base=`awk 'BEGIN { FS="=" } /^GLUON=([a-f0-9]+)(\s*#.+)?$/ { print $2; }' ${versionfile} | awk 'BEGIN { FS="#" } { print $1; }'`
+branch=`awk 'BEGIN { FS="=" } /^BRANCH=([a-z]+)$/ { print $2; }' ${versionfile}`
+version=`awk 'BEGIN { FS="=" } /^VERSION=([0-9\.\-+~a-z]+)$/ { print $2; }' ${versionfile}`
+site=`awk 'BEGIN { FS="=" } /^SITE=([a-f0-9]+)(\s*#.+)?$/ { print $2; }' ${versionfile} | awk 'BEGIN { FS="#" } { print $1; }'`
+targets=`awk 'BEGIN { FS="=" } /^TARGETS=.+$/ { print $2; }' ${versionfile}`
+ts=`awk 'BEGIN { FS="=" } /^TS=.+$/ { print $2; }' ${versionfile}`
+
+[ -n "${base}" ] || abort "Failed to parse Gluon base commit-id from version file."
+[ -n "${branch}" ] || abort "Failed to parse branch name from version file."
+[ -n "${version}" ] || abort "Failed to parse version from version file."
+[ -n "${site}" ] || abort "Failed to parse site repo commit-id from version file."
+[ -n "${targets}" ] || abort "Failed to parse targets from version file"
+[ -n "${ts}" ] || abort "Failed to parse timestamp from version file."
 
 # remove all spaces from git-commit-ids
 base="${base// /}"
 site="${site// /}"
 
-info "Building $branch version '$version' again ..."
-echo " * Gluon base = $base"
-echo " * Site repo  = $site_repo"
-echo " * Site commit= $site"
-echo " * Timestamp  = $ts"
-echo " * Targets    = $targets"
+info "Building ${branch} version '${version}' again ..."
+echo " * Gluon base = ${base}"
+echo " * Site commit= ${site}"
+echo " * Timestamp  = ${ts}"
+echo " * Targets    = ${targets}"
 echo
 
 # invoke build script
-if [ "$NO_DOCKER" == "1" ]; then
-	BASE="$base" BRANCH="$branch" SITE="$site_repo" SITE_ID="$site" VERSION="$version" BUILD_TS="$ts" TARGETS="$targets" BROKEN="$BROKEN" ./build.sh
+if [ "${NO_DOCKER}" -eq "1" ]; then
+	BASE="${base}" BRANCH="${branch}" SITE_ID="${site}" VERSION="${version}" BUILD_TS="${ts}" TARGETS="${targets}" BROKEN="${BROKEN}" ./build.sh
 else
-	BASE="$base" BRANCH="$branch" SITE="$site_repo" SITE_ID="$site" VERSION="$version" BUILD_TS="$ts" TARGETS="$targets" BROKEN="$BROKEN" ./docker-build.sh
+	BASE="${base}" BRANCH="${branch}" SITE="${site_repo}" SITE_ID="${site}" VERSION="${version}" BUILD_TS="${ts}" TARGETS="${targets}" BROKEN="${BROKEN}" ./docker-build.sh
 fi
 
+popd > /dev/null #${MY_DIR}

docker-build.sh

@@ -19,21 +19,23 @@ if [ running_in_docker -a "$(id -un)" == "build" ]; then
 fi
 
 MYDIR="$(dirname $0)"
-MYDIR="$(readlink -f $MYDIR)"
-pushd "$MYDIR" > /dev/null
+MYDIR="$(readlink -f ${MYDIR})"
+pushd "${MYDIR}" > /dev/null
 
 # run the container with fixed hostname and mapped /code directory
-docker run -ti -h ffho-build -v "$MYDIR:/code" \
-    --env BUILD_TS="$BUILD_TS" \
-    --env BASE="$BASE" \
-    --env BRANCH="$BRANCH" \
-    --env BROKEN="$BROKEN" \
-    --env MAKEJOBS="$MAKEJOBS" \
-    --env VERBOSE="$VERBOSE" \
-    --env VERSION="$VERSION" \
-    --env TARGETS="$TARGETS" \
-    --env SITE="$SITE" \
-    --env SITE_ID="$SITE_ID" \
+docker run -ti -h ffho-build -v "${MYDIR}:/code" \
+    --env BASE="${BASE}" \
+    --env BRANCH="${BRANCH}" \
+    --env VERSION="${VERSION}" \
+    --env AUTOUPDATER="${AUTOUPDATER}"
+    --env BROKEN="${BROKEN}" \
+    --env BUILD_TS="${BUILD_TS}" \
+    --env DIRCLEAN="${DIRCLEAN}" \
+    --env MAKEJOBS="${MAKEJOBS}" \
+    --env PRIORITY="${PRIORITY}" \
+    --env SITE_ID="${SITE_ID}" \
+    --env TARGETS="${TARGETS}" \
+    --env VERBOSE="${VERBOSE}" \
     ffpb/build
 
-popd > /dev/null
+popd > /dev/null #${MYDIR}