From 632740369b83a3b4c913157990bee5d87e58cc01 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Wed, 28 Dec 2016 03:55:54 -0800 Subject: [PATCH 01/10] [Emacs] Fix cask compile script --- bin/compile.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/bin/compile.sh b/bin/compile.sh index a100f7a9..cc12e4b5 100755 --- a/bin/compile.sh +++ b/bin/compile.sh @@ -9,8 +9,6 @@ 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 From 39d3f20de528c93ea16dd72c91a5b6e21c502268 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Wed, 28 Dec 2016 04:03:12 -0800 Subject: [PATCH 02/10] [Emacs] Fix copy of README.html --- bin/compile.sh | 2 +- bin/generate-html.el | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/compile.sh b/bin/compile.sh index cc12e4b5..829f6108 100755 --- a/bin/compile.sh +++ b/bin/compile.sh @@ -14,4 +14,4 @@ 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/../emacs.d/README.html" out diff --git a/bin/generate-html.el b/bin/generate-html.el index c272649c..7efe6815 100755 --- a/bin/generate-html.el +++ b/bin/generate-html.el @@ -16,6 +16,8 @@ (setq readme-src (concat emacs-dir "README.org")) (org-babel-tangle-file readme-src) + +(require 'use-pacakge) (load-file (concat emacs-dir "org-config.el")) (defun export-target (target) From e229a8c0446c24468f75e2cb15607018ab7e9ee6 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Wed, 28 Dec 2016 04:10:50 -0800 Subject: [PATCH 03/10] [Emacs] Actually fix compile copy --- bin/compile.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/compile.sh b/bin/compile.sh index 829f6108..0a9c05ac 100755 --- a/bin/compile.sh +++ b/bin/compile.sh @@ -14,4 +14,4 @@ curl -fsSkL https://raw.github.com/cask/cask/master/go | python cask install cask exec emacs --script generate-html.el -cp "$THIS_DIR/../emacs.d/README.html" out +cp "$THIS_DIR/../dotfiles/emacs.d/README.html" out From 6b45e61a69416497e3c111041b17699f44199394 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Wed, 28 Dec 2016 04:11:40 -0800 Subject: [PATCH 04/10] [Emacs] Fix use-package error message --- bin/generate-html.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/generate-html.el b/bin/generate-html.el index 7efe6815..4a18b971 100755 --- a/bin/generate-html.el +++ b/bin/generate-html.el @@ -15,9 +15,8 @@ (setq readme-src (concat emacs-dir "README.org")) -(org-babel-tangle-file readme-src) - (require 'use-pacakge) +(org-babel-tangle-file readme-src) (load-file (concat emacs-dir "org-config.el")) (defun export-target (target) From af34de431a4c376dde02021779a82a3138cbdf1c Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Wed, 28 Dec 2016 04:18:49 -0800 Subject: [PATCH 05/10] [Emacs] Fix a spello in generate-html --- bin/generate-html.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/generate-html.el b/bin/generate-html.el index 4a18b971..cddfd9ed 100755 --- a/bin/generate-html.el +++ b/bin/generate-html.el @@ -15,7 +15,7 @@ (setq readme-src (concat emacs-dir "README.org")) -(require 'use-pacakge) +(require 'use-package) (org-babel-tangle-file readme-src) (load-file (concat emacs-dir "org-config.el")) From 03aab59ddf95973ae900a861f02c9fcd6e000def Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Wed, 28 Dec 2016 04:26:43 -0800 Subject: [PATCH 06/10] [Emacs] Separate org-plus-contrib requirement --- dotfiles/emacs.d/README.org | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dotfiles/emacs.d/README.org b/dotfiles/emacs.d/README.org index 03318f7f..f81cc822 100644 --- a/dotfiles/emacs.d/README.org +++ b/dotfiles/emacs.d/README.org @@ -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 From 164df7af0a52b9cf0a403b5e6c94d74611a10934 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Wed, 28 Dec 2016 04:30:10 -0800 Subject: [PATCH 07/10] [Emacs] Add s as cask dependency for batch --- bin/Cask | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/Cask b/bin/Cask index 6bd7493d..2632f8af 100644 --- a/bin/Cask +++ b/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") From 98ff3fde33b98372b9db2bddc3c649591b272bee Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Wed, 28 Dec 2016 04:33:45 -0800 Subject: [PATCH 08/10] Meh --- bin/generate-html.el | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/generate-html.el b/bin/generate-html.el index cddfd9ed..c2c49ba0 100755 --- a/bin/generate-html.el +++ b/bin/generate-html.el @@ -16,6 +16,7 @@ (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")) From 8a3ac3c73b4c716235fd86fabafc76609cd8986c Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Wed, 28 Dec 2016 04:42:42 -0800 Subject: [PATCH 09/10] Meh2 --- .travis.yml | 1 + bin/deploy.sh | 10 ++-------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 236399d3..7ad91550 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,3 +5,4 @@ env: global: - ENCRYPTION_LABEL: "73e6c870aa87" - COMMIT_AUTHOR_EMAIL: "IvanMalison@gmail.com" + - COMMIT_AUTHOR_NAME: "Ivan Malison" diff --git a/bin/deploy.sh b/bin/deploy.sh index 5d3fcaa2..9ae9abc7 100755 --- a/bin/deploy.sh +++ b/bin/deploy.sh @@ -44,15 +44,9 @@ 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 add --all . git commit -m "Deploy to GitHub Pages: ${SHA}" # Get the deploy key by using Travis's stored variables to decrypt deploy_key.enc @@ -65,4 +59,4 @@ chmod 600 deploy_key eval `ssh-agent -s` ssh-add deploy_key -git push $SSH_REPO $TARGET_BRANCH +git push "$SSH_REPO" "$TARGET_BRANCH" From 25733425efadc51e0cdb8f21e60ea1708a3172a6 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Wed, 28 Dec 2016 04:50:17 -0800 Subject: [PATCH 10/10] Mehfdsa --- bin/deploy.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/bin/deploy.sh b/bin/deploy.sh index 9ae9abc7..e39873ed 100755 --- a/bin/deploy.sh +++ b/bin/deploy.sh @@ -39,16 +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" - -# 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}" - # 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" @@ -59,4 +49,14 @@ chmod 600 deploy_key eval `ssh-agent -s` ssh-add deploy_key +# 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"