From ece734b55a1915aa58a2b1ab29b22008eef404f1 Mon Sep 17 00:00:00 2001
From: penrods <github@gpll.org>
Date: Wed, 2 Aug 2017 23:37:25 -0500
Subject: [PATCH] Prevent unneeded mimic compilation in dev_setup.sh

The code that detected existing mimic installs and asked for
confirmation before rebuilding had a few holes:
* A source install of mimic under the mycroft-core tree was missed
* Hitting "enter" or "spacebar" would be interpreted as "yes, rebuild",
  which didn't match the prompt.
---
 dev_setup.sh | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/dev_setup.sh b/dev_setup.sh
index 15024edae3..d45b03549e 100755
--- a/dev_setup.sh
+++ b/dev_setup.sh
@@ -44,19 +44,30 @@ else
     VIRTUALENV_ROOT="$WORKON_HOME/mycroft"
 fi
 
-# skip mimic build?
+# Check whether to build mimic (it takes a really long time!)
+build_mimic='y'
 if [[ "$1" == '-sm' ]] ; then 
   build_mimic='n'
-fi
+else
+  # first, look for a build of mimic in the folder
+  has_mimic=""
+  if [[ -f ${TOP}/mimic/bin/mimic ]] ; then
+      has_mimic=$( ${TOP}/mimic/bin/mimic -lv | grep Voice )
+  fi
 
-if [[ "$1" != '-sm' ]] && hash mimic ; then
-  if mimic -lv | grep -q Voice ; then
-    echo "Existing mimic installation. press y to build mimic again, any other key to skip."
+  # in not, check the system path
+  if [ "$has_mimic" = "" ] ; then
+    if [ -x "$(command -v mimic)" ]; then
+      has_mimic="$( mimic -lv | grep Voice )"
+    fi
+  fi
+
+  if ! [ "$has_mimic" == "" ] ; then
+    echo "Mimic is installed. Press 'y' to rebuild mimic, any other key to skip."
     read -n1 build_mimic
   fi
 fi
 
-
 # create virtualenv, consistent with virtualenv-wrapper conventions
 if [ ! -d "${VIRTUALENV_ROOT}" ]; then
    mkdir -p $(dirname "${VIRTUALENV_ROOT}")
@@ -84,8 +95,7 @@ echo "Building with $CORES cores."
 #build and install mimic
 cd "${TOP}"
 
-build_mimic="${build_mimic:-y}"  
-if [[ "$build_mimic" == 'y' ]] ; then
+if [[ "$build_mimic" == 'y' ]] || [[ "$build_mimic" == 'Y' ]]; then
   echo "WARNING: The following can take a long time to run!"
   "${TOP}/scripts/install-mimic.sh"
 else