Revert "Rename .tools to .mystools for Arduino IDE" (#687)

2016-12-11 13:28:37 -08:00
parent 68ce74d11a
commit 1e37f35dc6
12 changed files with 7 additions and 8 deletions
@@ -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) ]; 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
@@ -23,7 +23,7 @@ editor linters, etc.)

 The [boostrap-dev](bootstrap-dev.sh) script completely configures a
 development environment. The boostrap-dev script validates development
-prerequisites such as verifying the git repo ```origin``` &
+pre-requisites such as verifying the git repo ```origin``` &
 ```upstream``` remotes, tools needed for the git client hooks,
 installing local commit hooks, and creating git aliases, etc.

@@ -32,7 +32,7 @@ $ cd MySensors    # git repo
 $ .tools/bootstrap-dev.sh
 Checking operating system support: darwin16...
 Checking github 'origin' & 'upstream' remotes...
-Checking tool/utility prerequisites...
+Checking tool/utility pre-requisites...
 Installing git client-side hooks...
 Configuring git aliases for running mysensor tool bundles...
 Successfully configured your repo for MySensors development... Thanks for your support!
@@ -40,7 +40,7 @@ $
 ```
 **Note:**  If the bootstrap can not find required command-line
 utilities, you will be requested to install the required tools and
-re-run bootstrap.sh.  See [Installation instructions for prerequisite
+re-run bootstrap.sh.  See [Installation instructions for pre-requisite
 tools](#installtools).

 Once the bootstrapping process is complete, a git alias for each tool
@@ -76,7 +76,7 @@ team.  Gitler will also enforce the coding guidelines so the hooks are
 provided to reduce development cycle times by detecting standards
 variances locally before pushing to GitHub.

-### <a name="installtools"></a>Installation instructions for prerequisite tools
+### <a name="installtools"></a>Installation instructions for pre-requisite tools

 This first time you run the bootstrap script, it may inform you that
 certain development tools are missing from your path or system:
@@ -168,7 +168,6 @@ cd astyle/build/gcc && sudo make shared release shared static install
 curl -L 'https://sourceforge.net/projects/cppcheck/files/cppcheck/1.76.1/cppcheck-1.76.1.tar.gz/download' | tar xvz

 # Compile and install
-cd cppcheck-1.76.1
 sudo apt-get install libpcre++-dev
 sudo make SRCDIR=build CFGDIR=/usr/share/cppcheck HAVE_RULES=yes CXXFLAGS="-O2 -DNDEBUG -Wall -Wno-sign-compare -Wno-unused-function" install

@@ -44,8 +44,8 @@ install_hooks()
 #
 #  1.  Check that we are bootstrapping a supported OS/environment
 #  2.  Validate github remotes include valid upstream and origin
-#  3.  Check for client commit hook prerequisites
-#  4.  Install client commit hook prerequisites
+#  3.  Check for client commit hook pre-requisites
+#  4.  Install client commit hook pre-requisites
 #  5.  Define aliases for conveniently running tool bundles
 ##