[Fix #2144] Create a docker image to mimic the TravisCI environment (#2145)

4 files changed, 18 insertions, 12 deletions

diff --git a/travis-ci/install-cask.sh b/travis-ci/install-cask.sh
index 3f4ae446..fc2438b6 100755
--- a/travis-ci/install-cask.sh
+++ b/travis-ci/install-cask.sh
@@ -1,14 +1,13 @@
-#!/bin/bash
+#!/bin/bash -x
 
 # Install cask for Travis CI
 # or if already installed, then check for updates
 
-set -x
-
 WORKDIR=${HOME}/local
 CASKDIR=$WORKDIR/cask
+SCRIPTDIR=`dirname $(readlink -f $0)`
 
-. travis-ci/retry.sh
+. $SCRIPTDIR/retry.sh
 
 cask_upgrade_cask_or_reset() {
     cask upgrade-cask || { rm -rf $HOME/.emacs.d/.cask && false; }
@@ -30,4 +29,7 @@ fi
 # Install dependencies for cider as descriped in ./Cask
 # Effect is identical to "make elpa", but here we can retry
 # in the event of network failures.
-travis_retry cask_install_or_reset && touch elpa-emacs
+if [ -f Cask ]
+then
+    travis_retry cask_install_or_reset && touch elpa-emacs
+fi
diff --git a/travis-ci/install-evm.sh b/travis-ci/install-evm.sh
index f3481071..ef9bb979 100755
--- a/travis-ci/install-evm.sh
+++ b/travis-ci/install-evm.sh
@@ -1,14 +1,13 @@
-#!/bin/bash
+#!/bin/bash -x
 
 # Install evm for Travis CI
 # or if already installed, then check for updates
 
-set -x
-
 WORKDIR=${HOME}/local
 EVMDIR=$WORKDIR/evm
+SCRIPTDIR=`dirname $(readlink -f $0)`
 
-. travis-ci/retry.sh
+. $SCRIPTDIR/retry.sh
 
 if [ -d $EVMDIR ]
 then
diff --git a/travis-ci/install-gnutls.sh b/travis-ci/install-gnutls.sh
index 121dbfdf..bd3316b4 100755
--- a/travis-ci/install-gnutls.sh
+++ b/travis-ci/install-gnutls.sh
@@ -1,11 +1,9 @@
-#!/bin/bash
+#!/bin/bash -x
 
 # Setup a newer gnutls-cli on Travis CI
 # We need this as long as the Travis workers are Ubuntu 14.04
 # and the TLS cert chain on elpa.gnu.org is out-of-order
 
-set -x
-
 # adjust these versions as needed
 export NETTLE_VERSION=3.4
 export GNUTLS_VERSION=3.5.16
@@ -14,6 +12,12 @@ export WORKDIR=${HOME}/local/
 export LD_LIBRARY_PATH=${WORKDIR}/lib/
 export PKG_CONFIG_PATH=${WORKDIR}/lib/pkgconfig/
 
+# make sure workdir exists
+if [ ! -d ${WORKDIR} ]
+then
+    mkdir $WORKDIR
+fi
+
 # exit if the cache is valid and up-to-date
 if [ -f ${WORKDIR}/bin/gnutls-cli ] && \
    [ -f ${WORKDIR}/nettle-${NETTLE_VERSION}.tar.gz ] && \
diff --git a/travis-ci/prompt.sh b/travis-ci/prompt.sh
new file mode 100644
index 00000000..ef95931c
--- /dev/null
+++ b/travis-ci/prompt.sh
@@ -0,0 +1 @@
+export PS1="(\$(sed -ne 's/^.*\(emacs-.*-travis\).*$/\1/p' ~/local/evm/.config)) \w$ "