Merge branch 'master' of github.com:IvanMalison/dotfiles

gen-gh-pages/compile.sh

@@ -1,15 +1,5 @@
 #!/usr/bin/env bash
 
-function run_make_on_org () {
-	original="$(pwd)"
-	cd .cask
-	cd "$(ls | head)"
-	cd elpa
-	cd "$(ls | grep org-plus)"
-	make autoloads
-	cd $original
-}
-
 export PATH="$HOME/.cask/bin:$HOME/.evm/bin:$PATH"
 THIS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
@@ -18,17 +8,12 @@ TARGET=$(readlink -f "$THIS_DIR/../dotfiles/emacs.d/README.org")
 git clone https://github.com/rejeep/evm.git "$HOME/.evm"
 evm config path /tmp
 evm install emacs-25.1-travis --use --skip
-export PATH="$HOME/.evm/bin:$PATH"
+export EMACS="$(evm bin)"
 
 curl -fsSkL https://raw.github.com/cask/cask/master/go | python
-export PATH="/home/travis/.cask/bin:$PATH"
-
-echo "this is PATH $PATH"
-type -a emacs
 
 cask install
-run_make_on_org
-cask exec emacs --script generate-html.el
+cask exec "$EMACS" --script generate-html.el
 
 mv "$THIS_DIR/../dotfiles/emacs.d/README.html" .