+32
-13
lines changedFilter options
+32
-13
lines changed Original file line number Diff line number Diff line change
@@ -83,7 +83,20 @@ Arguments FNC and ARGS are used for advice `:around'."
83 83
"Return non-nil if terminal supports colors.")
84 84 85 85
(defconst eask-homedir (getenv "EASK_HOMEDIR")
86 -
"Eask's home directory path.")
86 +
"Eask's home directory path.
87 + 88 +
It points to the global home directory `/path/to/home/.eask/'.")
89 + 90 +
(defconst eask-userdir (expand-file-name "../" eask-homedir)
91 +
"Eask's user directory path.
92 + 93 +
It points to the global user directory `/path/to/home/'.")
94 + 95 +
(defconst eask-package-sys-dir (expand-file-name (concat emacs-version "/elpa/")
96 +
eask-homedir)
97 +
"Eask global elpa directory; it will be treated as the system-wide packages.
98 + 99 +
It points to the global elpa directory `/path/to/home/.eask/XX.X/elpa/'")
87 100 88 101
(defconst eask-invocation (getenv "EASK_INVOCATION")
89 102
"Eask's invocation program path.")
@@ -679,6 +692,7 @@ Argument BODY are forms for execution."
679 692
(declare (indent 1) (debug t))
680 693
`(let ((package-archives package-archives)
681 694
(archives (eask-listify ,archives))
695 +
(package-user-dir eask-package-sys-dir) ; Point to the global directory.
682 696
(added))
683 697
(dolist (archive archives)
684 698
(unless (assoc archive package-archives)
@@ -1246,12 +1260,15 @@ This uses function `locate-dominating-file' to look up directory tree."
1246 1260
(defmacro eask--setup-home (dir &rest body)
1247 1261
"Set up config directory in DIR, then execute BODY."
1248 1262
(declare (indent 1) (debug t))
1249 -
`(let* ((user-emacs-directory (expand-file-name (concat ".eask/" emacs-version "/") ,dir))
1250 -
(package-user-dir (expand-file-name "elpa" user-emacs-directory))
1251 -
(early-init-file (locate-user-emacs-file "early-init.el"))
1252 -
(eask-dot-emacs-file (locate-user-emacs-file ".emacs"))
1253 -
(user-init-file (locate-user-emacs-file "init.el"))
1254 -
(custom-file (locate-user-emacs-file "custom.el")))
1263 +
`(let* ((user-emacs-directory (expand-file-name (concat ".eask/" emacs-version "/") ,dir))
1264 +
(package-user-dir (expand-file-name "elpa/" user-emacs-directory))
1265 +
;; Add global scope elpa directory.
1266 +
(package-directory-list (append package-directory-list
1267 +
(list eask-package-sys-dir)))
1268 +
(early-init-file (locate-user-emacs-file "early-init.el"))
1269 +
(eask-dot-emacs-file (locate-user-emacs-file ".emacs"))
1270 +
(user-init-file (locate-user-emacs-file "init.el"))
1271 +
(custom-file (locate-user-emacs-file "custom.el")))
1255 1272
,@body))
1256 1273 1257 1274
;; NOTE: If you modified this function, make sure you modified `core/emacs.el'
@@ -1295,7 +1312,7 @@ This uses function `locate-dominating-file' to look up directory tree."
1295 1312
(eask--load-config)
1296 1313
(eask--with-hooks ,@body)))
1297 1314
((eask-global-p)
1298 -
(eask--setup-home (concat eask-homedir "../") ; `/home/user/', escape `.eask'
1315 +
(eask--setup-home eask-userdir
1299 1316
(let ((eask--first-init-p (not (file-directory-p user-emacs-directory))))
1300 1317
;; We accept Eask-file in `global' scope, but it shouldn't be used
1301 1318
;; for the sandbox.
@@ -1314,7 +1331,7 @@ This uses function `locate-dominating-file' to look up directory tree."
1314 1331
(eask-file-try-load default-directory)
1315 1332
;; Then setup the user directory according to the Eask-file!
1316 1333
(eask--setup-home (or eask-file-root
1317 -
(concat eask-homedir "../"))
1334 +
eask-userdir)
1318 1335
(let ((eask--first-init-p (not (file-directory-p user-emacs-directory)))
1319 1336
(scope (if eask-file-root "" "global ")))
1320 1337
(eask-with-verbosity 'debug
@@ -62,9 +62,9 @@
62 62 63 63
(defun eask-status--print-infos (lst)
64 64
"Print environment info LST."
65 -
(let* ((len-0 (eask-2str (eask-status--list-max-length lst 0)))
65 +
(let* ((len-0 (eask-2str (eask-status--list-max-length lst 0))) ; unused
66 66
(len-1 (eask-2str (+ (eask-status--list-max-length lst 1) 2)))
67 -
(fmt (concat " %-21s %-" len-1 "s %s")))
67 +
(fmt (concat " %-24s %-" len-1 "s %s")))
68 68
(dolist (pair lst)
69 69
(when pair
70 70
(eask-status--print-info fmt pair)
@@ -96,6 +96,8 @@
96 96
,(eask-status--file-dir user-emacs-directory))
97 97
("ELPA directory" ,(expand-file-name package-user-dir)
98 98
,(eask-status--file-dir package-user-dir))
99 +
("ELPA directory (system)" ,eask-package-sys-dir
100 +
,(eask-status--file-dir eask-package-sys-dir))
99 101
("early-init.el" ,(expand-file-name early-init-file)
100 102
,(eask-status--file-dir early-init-file))
101 103
(".emacs" ,(expand-file-name eask-dot-emacs-file)
@@ -106,10 +108,10 @@
106 108
"nil")
107 109
,(when custom-file (eask-status--file-dir custom-file)))))
108 110 109 -
(eask-status--print-title "Eask-file:")
111 +
(eask-status--print-title "Eask:")
110 112
(eask-status--print-infos
111 113
`(("Eask file" ,(or eask-file "missing"))
112 -
("Eask-file Count" ,(length (eask--find-files default-directory)))))
114 +
("Eask file Count" ,(length (eask--find-files default-directory)))))
113 115 114 116
(eask-info "(Total of %s states listed)" eask-status--info-count))
115 117 You can’t perform that action at this time.
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4