Merge branch 'master' of github.com:IvanMalison/dotfiles
This commit is contained in:
commit
09f76d35c2
@ -5,3 +5,4 @@ env:
|
||||
global:
|
||||
- ENCRYPTION_LABEL: "73e6c870aa87"
|
||||
- COMMIT_AUTHOR_EMAIL: "IvanMalison@gmail.com"
|
||||
- COMMIT_AUTHOR_NAME: "Ivan Malison"
|
||||
|
1
bin/Cask
1
bin/Cask
@ -1,6 +1,7 @@
|
||||
(source org)
|
||||
(source melpa)
|
||||
|
||||
(depends-on "s")
|
||||
(depends-on "use-package")
|
||||
(depends-on "org-plus-contrib")
|
||||
(depends-on "htmlize")
|
||||
|
@ -9,11 +9,9 @@ git clone https://github.com/rejeep/evm.git "$HOME/.evm"
|
||||
evm config path /tmp
|
||||
evm install emacs-25.1-travis --use --skip
|
||||
|
||||
export EMACS=$(sh -c 'type -P emacs')
|
||||
|
||||
curl -fsSkL https://raw.github.com/cask/cask/master/go | python
|
||||
|
||||
cask install
|
||||
cask exec emacs --script generate-html.el
|
||||
|
||||
cp "../dotfiles/emacs.d/README.html" out
|
||||
cp "$THIS_DIR/../dotfiles/emacs.d/README.html" out
|
||||
|
@ -39,22 +39,6 @@ rm -rf out/**/* || exit 0
|
||||
# Run our compile script
|
||||
doCompile
|
||||
|
||||
# Now let's go have some fun with the cloned repo
|
||||
cd out
|
||||
git config user.name "$COMMIT_AUTHOR_NAME"
|
||||
git config user.email "$COMMIT_AUTHOR_EMAIL"
|
||||
|
||||
# If there are no changes to the compiled out (e.g. this is a README update) then just bail.
|
||||
if [ -z `git diff --exit-code` ]; then
|
||||
echo "No changes to the output on this push; exiting."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Commit the "changes", i.e. the new version.
|
||||
# The delta will show diffs between new and old versions.
|
||||
git add .
|
||||
git commit -m "Deploy to GitHub Pages: ${SHA}"
|
||||
|
||||
# Get the deploy key by using Travis's stored variables to decrypt deploy_key.enc
|
||||
ENCRYPTED_KEY_VAR="encrypted_${ENCRYPTION_LABEL}_key"
|
||||
ENCRYPTED_IV_VAR="encrypted_${ENCRYPTION_LABEL}_iv"
|
||||
@ -66,4 +50,14 @@ chmod 600 deploy_key
|
||||
eval `ssh-agent -s`
|
||||
ssh-add deploy_key
|
||||
|
||||
git push $SSH_REPO $TARGET_BRANCH
|
||||
# Now let's go have some fun with the cloned repo
|
||||
cd out
|
||||
git config user.name "$COMMIT_AUTHOR_NAME"
|
||||
git config user.email "$COMMIT_AUTHOR_EMAIL"
|
||||
|
||||
# Commit the "changes", i.e. the new version.
|
||||
# The delta will show diffs between new and old versions.
|
||||
git add --all .
|
||||
git commit -m "Deploy to GitHub Pages: ${SHA}"
|
||||
|
||||
git push "$SSH_REPO" "$TARGET_BRANCH"
|
||||
|
@ -15,6 +15,8 @@
|
||||
|
||||
(setq readme-src (concat emacs-dir "README.org"))
|
||||
|
||||
(require 'use-package)
|
||||
(require 's)
|
||||
(org-babel-tangle-file readme-src)
|
||||
(load-file (concat emacs-dir "org-config.el"))
|
||||
|
||||
|
@ -2779,10 +2779,14 @@ Intero seems to be causing hangs, so it has been disabled
|
||||
#+END_SRC
|
||||
** Document
|
||||
*** org
|
||||
**** Require the latest version of org-mode
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(use-package org
|
||||
:ensure org-plus-contrib)
|
||||
#+END_SRC
|
||||
**** config
|
||||
#+BEGIN_SRC emacs-lisp :tangle org-config.el
|
||||
(use-package org
|
||||
:ensure org-plus-contrib
|
||||
:bind (:map org-mode-map
|
||||
(("C-e" . end-of-visual-line)))
|
||||
:preface
|
||||
|
Loading…
Reference in New Issue
Block a user