From 121577487f4a242156e3736cde38bfbe77813fd3 Mon Sep 17 00:00:00 2001
From: Christian Clauss <cclauss@me.com>
Date: Fri, 9 Aug 2019 22:15:33 +0200
Subject: [PATCH 1/4] Replace $IS_TRAVIS with builtin $CI

Updates dev_setup.sh and scripts/prepare_msm.sh
Fixes #2243
---
 dev_setup.sh           | 2 +-
 scripts/prepare-msm.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev_setup.sh b/dev_setup.sh
index 91721f5cab..e54354355f 100755
--- a/dev_setup.sh
+++ b/dev_setup.sh
@@ -128,7 +128,7 @@ if found_exe tput ; then
 fi
 
 # Run a setup wizard the very first time that guides the user through some decisions
-if [[ ! -f .dev_opts.json && -z $IS_TRAVIS ]] ; then
+if [[ ! -f .dev_opts.json && -z $CI ]] ; then
     echo "
 $CYAN                    Welcome to Mycroft!  $RESET"
     sleep 0.5
diff --git a/scripts/prepare-msm.sh b/scripts/prepare-msm.sh
index 73f34aee8b..a7f948edb9 100755
--- a/scripts/prepare-msm.sh
+++ b/scripts/prepare-msm.sh
@@ -47,7 +47,7 @@ function change_ownership {
 }
 
 
-if [[ ${IS_TRAVIS} != true ]] ; then
+if [[ ${CI} != true ]] ; then
     if [ ! -d ${skills_dir} ] ; then
         echo "Create ${skills_dir}"
         $SUDO mkdir -p ${skills_dir}

From 8fd4a32fb1f1e53c8afa4b19d52c941847aafbda Mon Sep 17 00:00:00 2001
From: Christian Clauss <cclauss@me.com>
Date: Fri, 9 Aug 2019 22:26:41 +0200
Subject: [PATCH 2/4] Remove definition of $IS_TRAVIS

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8174277dc7..dfaa0adcfe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,8 +31,6 @@ install:
 script:
  - pycodestyle mycroft test
  - ./start-mycroft.sh unittest
-env:
- - IS_TRAVIS=true
 
 after_success:
   coveralls

From 89a48b9f798fdedd2b5d21180f27a05f21f8f4cc Mon Sep 17 00:00:00 2001
From: Christian Clauss <cclauss@me.com>
Date: Fri, 9 Aug 2019 22:59:05 +0200
Subject: [PATCH 3/4] Force a rebuild

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index dfaa0adcfe..8a42b22b38 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,9 @@ python:
   - "3.6"
   - "3.7"
 # don't rebuild pocketsphinx for every build
-cache: pocketsphinx-python
+cache:
+  - pip
+  - pocketsphinx-python
 # command to install dependencies
 install:
  - rm -rf ${TMPDIR}

From a77216714d41108e4a794f55db1719732a869d30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=85ke=20Forslund?= <ake.forslund@gmail.com>
Date: Thu, 26 Sep 2019 16:31:02 +0200
Subject: [PATCH 4/4] Replace new instance of IS_TRAVIS with CI

---
 dev_setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev_setup.sh b/dev_setup.sh
index e54354355f..cf81ed25f0 100755
--- a/dev_setup.sh
+++ b/dev_setup.sh
@@ -298,7 +298,7 @@ function install_deps() {
     elif os_is_like debian || os_is debian || os_is_like ubuntu || os_is ubuntu || os_is linuxmint; then
         # Debian / Ubuntu / Mint
         echo "$GREEN Installing packages for Debian/Ubuntu/Mint...$RESET"
-        if dpkg -V libjack-jackd2-0 > /dev/null 2>&1 && [[ -z $IS_TRAVIS ]] ; then
+        if dpkg -V libjack-jackd2-0 > /dev/null 2>&1 && [[ -z ${CI} ]] ; then
             echo "
 We have detected that your computer has the libjack-jackd2-0 package installed.
 Mycroft requires a conflicting package, and will likely uninstall this package.