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

fix some (not all) warnings that shellcheck displays

Browse source
This commit is contained in:
Daniel Frank 2019-05-26 22:14:30 +02:00
parent 1dc6507e8c
commit 12e8b053f5
Signed by: tokudan
GPG key ID: 063CCCAD04182D32
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
build.sh
View file

@ -2,7 +2,7 @@
set -e set -e
function announce () { function announce () {
echo '############################' $* >&2 echo '############################' "$@" >&2
} }
function usage () { function usage () {
echo "Usage: $0 -g GLUON_PATH" >&2 echo "Usage: $0 -g GLUON_PATH" >&2
@ -60,21 +60,21 @@ if [ -z "$gluon_path" ]; then
exit 1 exit 1
fi fi
gluon_path=$(realpath $gluon_path) gluon_path=$(realpath "$gluon_path")
gluon_out=$(realpath $gluon_out) 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
announce FFHH SITE PATH: $site_path >&2 announce FFHH SITE PATH: "$site_path" >&2
pushd $site_path pushd "$site_path"
. ./build.conf . ./build.conf
[ "${GLUON_BRANCH}" = "experimental" ] && GLUON_RELEASE="${GLUON_RELEASE}~exp$(date +%Y%m%d)" [ "${GLUON_BRANCH}" = "experimental" ] && GLUON_RELEASE="${GLUON_RELEASE}~exp$(date +%Y%m%d)"
export GLUON_RELEASE export GLUON_RELEASE
export GLUON_BRANCH export GLUON_BRANCH
# if a list of build targets has been supplied, only build those # if a list of build targets has been supplied, only build those
targets="$(echo "${build_targets:-$targets}" | sed -e 's_,_ _g')" targets="$(echo "${build_targets:-$targets}" | sed -e 's_,_ _g')"
announce The following targets will be generated: $targets >&2 announce "The following targets will be generated: $targets" >&2
popd popd
pushd "${gluon_path}" pushd "${gluon_path}"
@ -85,16 +85,16 @@ rm -rf "${GLUON_OUTPUTDIR}"
mkdir -p "${GLUON_OUTPUTDIR}" mkdir -p "${GLUON_OUTPUTDIR}"
make update make update
# Try to install patches. I wasn't able to figure out how patches in gluon/site/patches work. # Try to install patches. I wasn't able to figure out how patches in gluon/site/patches work.
for p in ${site_path}/patches/*.patch; do for p in "${site_path}"/patches/*.patch; do
if [ -e "$p" -a ! -f "${gluon_path}/${p##*/}" ]; then if [ -e "$p" ] && [ ! -f "${gluon_path}/${p##*/}" ]; then
announce Installing patch $p announce "Installing patch $p"
patch -p1 < $p patch -p1 < "$p"
touch "${gluon_path}/${p##*/}" touch "${gluon_path}/${p##*/}"
fi fi
done done
for t in $targets; do for t in $targets; do
announce Starting build for $t... >&2 announce "Starting build for $t..." >&2
make -j$(nproc) GLUON_TARGET=$t $verbose make "-j$(nproc)" "GLUON_TARGET=$t" "$verbose"
done done
# Generate the images.list # Generate the images.list
( cd "${GLUON_OUTPUTDIR}/images" && ( find -type f ! -iname '*.manifest' ! -iname images.list; find -type l ! -iname '*.manifest' ) | sed -e 's!^\./\(.*\)$!\1!' -e 's!/! !g' | sort > images.list ) ( cd "${GLUON_OUTPUTDIR}/images" && ( find -type f ! -iname '*.manifest' ! -iname images.list; find -type l ! -iname '*.manifest' ) | sed -e 's!^\./\(.*\)$!\1!' -e 's!/! !g' | sort > images.list )