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

fix build scripts

Browse source
This commit is contained in:
Daniel Frank 2017-11-06 21:32:40 +01:00
parent ef8b330e32
commit afb92c49db
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
build.sh
View file

@ -7,7 +7,7 @@ function announce () {
proc=$(nproc) proc=$(nproc)
gluon_out="${HOME}/firmware" gluon_out="${HOME}/firmware"
while getopts g:j:l:o:s:bmv opt; do while getopts g:j:l:o:s:u:bmv opt; do
case "$opt" in case "$opt" in
g) gluon_path="$OPTARG" ;; g) gluon_path="$OPTARG" ;;
l) sites="$OPTARG" ;; l) sites="$OPTARG" ;;
@ -41,7 +41,7 @@ site_path=$(realpath $(dirname $BASH_SOURCE))
announce GLUON: $gluon_path >&2 announce GLUON: $gluon_path >&2
announce FFHH SITE PATH: $site_path >&2 announce FFHH SITE PATH: $site_path >&2
pushd $site_path > /dev/null pushd $site_path
if [ "$dont_make_sites" == "" ]; then if [ "$dont_make_sites" == "" ]; then
# Build the site repo and generate all site configs # Build the site repo and generate all site configs
announce Building site repo and reading data >&2 announce Building site repo and reading data >&2
@ -57,9 +57,9 @@ if [ "$sites" == "" ]; then
fi fi
announce Gluon will be built for the following sites:$sites >&2 announce Gluon will be built for the following sites:$sites >&2
announce The following targets will be generated: $targets >&2 announce The following targets will be generated: $targets >&2
popd >/dev/null popd
pushd "${gluon_path}" >/dev/null pushd "${gluon_path}"
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}"
@ -95,7 +95,7 @@ for s in $sites; do
fi fi
fi fi
done done
popd >/dev/null popd
if [ -n "$uploadscript" ]; then if [ -n "$uploadscript" ]; then
announce Starting upload. Executing: $uploadscript $gluon_out/$GLUON_RELEASE announce Starting upload. Executing: $uploadscript $gluon_out/$GLUON_RELEASE
"$uploadscript" "$gluon_out/$GLUON_RELEASE" "$uploadscript" "$gluon_out/$GLUON_RELEASE"