fix(elisp): purely local cask

AndresTFG · May 20, 2016 · 48cb5db · 48cb5db
1 parent 3af7a44
commit 48cb5db
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -22,21 +22,21 @@ tutorial.org: $(ORGS)
 	cat header/html.org $< > $(TMPDIR)/$<.temp.org
 	(grep "\\\\cite{" $< && cat footer/bib.html.org >> $(TMPDIR)/$<.temp.org) || true
 	cp *.bib $(TMPDIR)
-	$(EMACS_BIN) --no-site-file --no-site-lisp -q --batch -l elisp/org-html-export.el --visit $(TMPDIR)/$<.temp.org -f org-html-export-to-html
+	$(CASK_BIN) exec $(EMACS_BIN) --no-site-file --no-site-lisp -q --batch -l elisp/org-html-export.el --visit $(TMPDIR)/$<.temp.org -f org-html-export-to-html
 	mv $(TMPDIR)/$<.temp.html $@
 	rm $(TMPDIR)/$<.temp.org
 
 quickref.tex: A1_Quick_Reference.org .cask elisp/org-pdf-export.el header/latex_quickref.org header/latex_quickref.tex
 	make gitinfo
 	cat header/latex_quickref.org $< > $(TMPDIR)/$<.temp.org
-	$(EMACS_BIN) --no-site-file --no-site-lisp -q --batch -l elisp/org-pdf-export.el --visit $(TMPDIR)/$<.temp.org -f org-latex-export-to-latex
+	$(CASK_BIN) exec $(EMACS_BIN) --no-site-file --no-site-lisp -q --batch -l elisp/org-pdf-export.el --visit $(TMPDIR)/$<.temp.org -f org-latex-export-to-latex
 	mv $(TMPDIR)/$<.temp.tex $@
 	rm $(TMPDIR)/$<.temp.org
 
 tutorial.tex: tutorial.org .cask elisp/org-pdf-export.el header/latex.org header/latex.tex footer/latex.org lean.bib
 	make gitinfo
 	cat header/latex.org $< footer/latex.org > $(TMPDIR)/$<.temp.org
-	$(EMACS_BIN) --no-site-file --no-site-lisp -q --batch -l elisp/org-pdf-export.el --visit $(TMPDIR)/$<.temp.org -f org-latex-export-to-latex
+	$(CASK_BIN) exec $(EMACS_BIN) --no-site-file --no-site-lisp -q --batch -l elisp/org-pdf-export.el --visit $(TMPDIR)/$<.temp.org -f org-latex-export-to-latex
 	mv $(TMPDIR)/$<.temp.tex $@
 	rm $(TMPDIR)/$<.temp.org
 

diff --git a/elisp/org-html-export.el b/elisp/org-html-export.el
@@ -1,13 +1,10 @@
-;; emacs org-mode batch configuration
-(require 'cask "~/.cask/cask.el")
-(cask-initialize "./")
+(require 'f)
 (setq working-dir (f-dirname (f-this-file)))
 (add-to-list 'load-path working-dir)
 (setq make-backup-files nil)
 
 ;;; ORG mode
 (require 's)
-(require 'f)
 (require 'org)
 (require 'ox-bibtex)
 (require 'dash)

diff --git a/elisp/org-pdf-export.el b/elisp/org-pdf-export.el
@@ -1,9 +1,7 @@
-(require 'cask "~/.cask/cask.el")
-(cask-initialize "./")
+(require 'f)
 (setq working-dir (f-dirname (f-this-file)))
 (add-to-list 'load-path working-dir)
 (setq make-backup-files nil)
-(add-to-list 'load-path (f-join working-dir "elisp"))
 (require 'org)
 (require 'ox)
 (require 'lean-export-util)