Override cppcheck library & platform options (#691)

* Using LIBRARY=[avr|gnu] git cppcheck ... will set the command
   line library= to the value
 * Using PLATFORM=[avr.xml|unix32.xml] git cppcheck ... will set
   the command line platform= to the value
 * Corrected logical if error when bootstapping a pristine repo

References #672
This commit is contained in:
Bruce Lacey
2016-12-13 00:26:11 +01:00
committed by Patrick Fallberg
parent 707442b257
commit 4753c1ec3d
3 changed files with 21 additions and 4 deletions
+2 -2
View File
@@ -24,7 +24,7 @@ tools_dir()
git_config_tools_dir='git config mysensors.toolsdir'
# Set mysensors.toolsdir in git config if it hasn't been set
if [ ! $($git_config_tools_dir) -o ! -d $($git_config_tools_dir) ]; then
if [[ ! $($git_config_tools_dir) || ! -d "$($git_config_tools_dir)" ]]; then
$git_config_tools_dir "$( cd "$(dirname "${BASH_SOURCE[0]}")"; git rev-parse --show-prefix )"
git config alias.mystoolspath '![ -z "${GIT_PREFIX}" ] || cd ${GIT_PREFIX}; echo $(git rev-parse --show-cdup)$(git config mysensors.toolsdir)'
fi
@@ -86,7 +86,7 @@ runBundle()
#
$(git rev-parse --is-inside-work-tree --quiet >/dev/null 2>&1) || err "Working directory is not a git repository. aborting..."
if environment_outdated && [[ $(basename "${0}") != *bootstrap* ]]; then
if [[ $(basename "${0}") != *bootstrap* ]] && environment_outdated ; then
err "Your environment is out of date... Re-run $(git mystoolspath)bootstrap-dev.sh and try again"
fi