freifunk/site-ffhh
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

some updates to the build.sh

Browse source
This commit is contained in:
Daniel Frank 2017-10-16 21:51:06 +02:00
parent 3f89fe6df3
commit c4aec4eaee
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
build.sh
View file

@ -5,10 +5,12 @@ function announce () {
} }
proc=$(nproc) proc=$(nproc)
gluon_out="${HOME}/firmware"
while getopts g:bj:v opt; do while getopts g:bj:v opt; do
case "$opt" in case "$opt" in
g) gluon_path="$OPTARG" ;; g) gluon_path="$OPTARG" ;;
o) gluon_out="$OPTARG" ;;
b) export BROKEN=1 ;; b) export BROKEN=1 ;;
j) proc="$OPTARG" ;; j) proc="$OPTARG" ;;
v) verbose=V=s ;; v) verbose=V=s ;;
@ -16,13 +18,16 @@ while getopts g:bj:v opt; do
done done
if [ -z "${gluon_path}" ]; then if [ -z "${gluon_path}" ]; then
echo "Usage: $0 -g GLUON_PATH" >&2 echo "Usage: $0 -g GLUON_PATH" >&2
echo " GLUON_PATH Path to a checkout of the gluon repository." >&2 echo " -g GLUON_PATH Path to a checkout of the gluon repository." >&2
echo " -o OUT_PATH Path to a checkout of the gluon repository." >&2
echo " -b BROKEN=1" >&2 echo " -b BROKEN=1" >&2
echo " -v verbose" >&2
echo " -j JOBS Run build with -jJOBS. Default: ${proc}" >&2 echo " -j JOBS Run build with -jJOBS. Default: ${proc}" >&2
exit 1 exit 1
fi fi
gluon_path=$(realpath $gluon_path) gluon_path=$(realpath $gluon_path)
gluon_out=$(realpath $gluon_out)
site_path=$(realpath $(dirname $BASH_SOURCE)) site_path=$(realpath $(dirname $BASH_SOURCE))
announce GLUON: $gluon_path >&2 announce GLUON: $gluon_path >&2
@ -46,7 +51,7 @@ pushd "${gluon_path}" >/dev/null
announce Starting make update... announce Starting make update...
for s in $sites; do for s in $sites; do
export GLUON_SITEDIR="${site_path}/sites/${s}" export GLUON_SITEDIR="${site_path}/sites/${s}"
export GLUON_OUTPUTDIR="${HOME}/firmware/${s}/${GLUON_BRANCH}/${GLUON_RELEASE}" export GLUON_OUTPUTDIR="${gluon_out}/${s}/${GLUON_BRANCH}/${GLUON_RELEASE}"
export GLUON_IMAGEDIR="${GLUON_OUTPUTDIR}/images" export GLUON_IMAGEDIR="${GLUON_OUTPUTDIR}/images"
export GLUON_MODULEDIR="${GLUON_OUTPUTDIR}/modules" export GLUON_MODULEDIR="${GLUON_OUTPUTDIR}/modules"
rm -rf "${GLUON_OUTPUTDIR}" rm -rf "${GLUON_OUTPUTDIR}"