Skip to content

Commit

Permalink
no package-install if source is available locally
Browse files Browse the repository at this point in the history
  This commit updates all places where packages are automatically
  installed using ELPA to first check if the package is available from a
  local source directory (i.e., under the src/ directory).  This makes
  it possible for users to override the ELPA versions of packages with
  local versions from source.  E.g., with this change I'm able to run my
  own fork of magit and starter-kit-misc.org will not install magit from
  ELPA.
  • Loading branch information
eschulte committed Jan 2, 2014
1 parent ed58615 commit 4bb0905
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion starter-kit-misc.org
Expand Up @@ -12,7 +12,7 @@ Determine whether required packages are installed. If not, use ELPA to
install them. Other dependencies are provided by Emacs 24.
#+begin_src emacs-lisp
(dolist (package '(magit))
(unless (package-installed-p package)
(unless (or (starter-kit-loadable-p package) (package-installed-p package))
(package-install package)))
#+end_src

Expand Down
2 changes: 1 addition & 1 deletion starter-kit-python.org
Expand Up @@ -13,7 +13,7 @@ Determine whether required packages are installed. If not, use ELPA to
install them.
#+begin_src emacs-lisp
(dolist (package '(python-mode ipython))
(unless (package-installed-p package)
(unless (or (starter-kit-loadable-p package) (package-installed-p package))
(package-install package)))
#+end_src

Expand Down
2 changes: 1 addition & 1 deletion starter-kit-ruby.org
Expand Up @@ -25,7 +25,7 @@ Support for the [[http://www.ruby-lang.org/en/][Ruby]] dynamic, open-source prog
** Yaml mode
#+begin_src emacs-lisp
(dolist (package '(yaml-mode))
(unless (package-installed-p package)
(unless (or (starter-kit-loadable-p package) (package-installed-p package))
(package-install package)))
(require 'yaml-mode)
(add-to-list 'auto-mode-alist '("\\.ya?ml$" . yaml-mode))
Expand Down
2 changes: 1 addition & 1 deletion starter-kit.org
Expand Up @@ -305,7 +305,7 @@ interested in the actual code implementing the starter kit.
(unless package-archive-contents
(package-refresh-contents))
(dolist (package starter-kit-packages)
(unless (package-installed-p package)
(unless (or (starter-kit-loadable-p package) (package-installed-p package))
(package-install package)))
#+end_src

Expand Down

0 comments on commit 4bb0905

Please sign in to comment.