rudefox/burrow-pi-img
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cosmetic renaming

Browse Source 
Renamed function dependencies_check to check_deps.

Also renamed files in scripts/ to have a .sh suffix which are bash shell
snippits:

   dependencies_check -> check_deps.sh
   common -> common.sh

Note check_deps.sh already existed in the tree but was an empty file
probably intended for the function now contained within.

Also added a comment at the top of the .sh files which are sourced so
that syntax-highlighting editors which distinguish between different
/bin/sh syntaxes have a clue to use the bash variant.
This commit is contained in:
T. Joseph Carter 2016-09-16 01:29:17 -07:00
parent a6dc6c14f2
commit 2e24801fe3
4 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.sh
View File

@ -156,11 +156,11 @@ export QUILT_NO_DIFF_INDEX=1
export QUILT_NO_DIFF_TIMESTAMPS=1
export QUILT_REFRESH_ARGS="-p ab"
source ${SCRIPT_DIR}/common
source ${SCRIPT_DIR}/dependencies_check
source ${SCRIPT_DIR}/common.sh
source ${SCRIPT_DIR}/check_deps.sh
dependencies_check ${BASE_DIR}/depends
check_deps ${BASE_DIR}/depends
mkdir -p ${WORK_DIR}
log "Begin ${BASE_DIR}"

33
scripts/check_deps.sh Executable file → Normal file
View File

@ -0,0 +1,33 @@
# bash #
# check_deps
# $@ Dependnecy files to check
#
# Each dependency is in the form of a tool to test for, optionally followed by
# a : and the name of a package if the package on a Debian-ish system is not
# named for the tool (i.e., qemu-user-static).
check_deps()
{
local depfile deps missing
for depfile in "$@"; do
if [[ -e "$depfile" ]]; then
deps="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < ${BASE_DIR}/depends)"
fi
for dep in $deps; do
if ! hash ${dep%:*} 2>/dev/null; then
missing="${missing:+$missing }${dep#*:}"
fi
done
done
if [[ "$missing" ]]; then
echo "Reqired dependencies not installed"
echo
echo "This can be resolved on Debian/Raspbian systems by installing:"
echo "$missing"
false
fi
}
export -f check_deps

2
scripts/common → scripts/common.sh
View File

@ -1,3 +1,5 @@
# bash #
log (){
date +"[%T] $@" | tee -a ${LOG_FILE}
}

30
scripts/dependencies_check
View File

@ -1,30 +0,0 @@
# dependencies_check
# $@ Dependnecy files to check
#
# Each dependency is in the form of a tool to test for, optionally followed by
# a : and the name of a package if the package on a Debian-ish system is not
# named for the tool (i.e., qemu-user-static).
dependencies_check()
{
local depfile deps missing
for depfile in "$@"; do
if [[ -e "$depfile" ]]; then
deps="$(sed -f "${SCRIPT_DIR}/remove-comments.sed" < ${BASE_DIR}/depends)"
fi
for dep in $deps; do
if ! hash ${dep%:*} 2>/dev/null; then
missing="${missing:+$missing }${dep#*:}"
fi
done
done
if [[ "$missing" ]]; then
echo "Reqired dependencies not installed"
echo
echo "This can be resolved on Debian/Raspbian systems by installing:"
echo "$missing"
false
fi
}