Mercurial > emacs
annotate lisp/eshell/em-unix.el @ 111540:ca297dbe1d56
Fix last cons in set_wm_state, remove unused variables.
* src/xselect.c (x_send_client_event): Remove unused variables cons and
size.
* src/xterm.c (set_wm_state): Add Qnil to final cons.
author | Jan D <jan.h.d@swipnet.se> |
---|---|
date | Sun, 14 Nov 2010 11:21:16 +0100 |
parents | 646142bd4c38 |
children | 417b1e4d63cd |
rev | line source |
---|---|
38414
67b464da13ec
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
37661
diff
changeset
|
1 ;;; em-unix.el --- UNIX command aliases |
29876 | 2 |
95152
ad5d26b1d5d1
Use eshell-defgroup rather than defgroup.
Glenn Morris <rgm@gnu.org>
parents:
94661
diff
changeset
|
3 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, |
106815 | 4 ;; 2008, 2009, 2010 Free Software Foundation, Inc. |
29876 | 5 |
32526 | 6 ;; Author: John Wiegley <johnw@gnu.org> |
7 | |
29876 | 8 ;; This file is part of GNU Emacs. |
9 | |
94661
b5b0801a7637
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
10 ;; GNU Emacs is free software: you can redistribute it and/or modify |
29876 | 11 ;; it under the terms of the GNU General Public License as published by |
94661
b5b0801a7637
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
12 ;; the Free Software Foundation, either version 3 of the License, or |
b5b0801a7637
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
13 ;; (at your option) any later version. |
29876 | 14 |
15 ;; GNU Emacs is distributed in the hope that it will be useful, | |
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
18 ;; GNU General Public License for more details. | |
19 | |
20 ;; You should have received a copy of the GNU General Public License | |
94661
b5b0801a7637
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
21 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
29876 | 22 |
87076
9b97b187c7e2
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
86202
diff
changeset
|
23 ;;; Commentary: |
29876 | 24 |
87076
9b97b187c7e2
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
86202
diff
changeset
|
25 ;; This file contains implementations of several UNIX command in Emacs |
9b97b187c7e2
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
86202
diff
changeset
|
26 ;; Lisp, for several reasons: |
9b97b187c7e2
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
86202
diff
changeset
|
27 ;; |
9b97b187c7e2
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
86202
diff
changeset
|
28 ;; 1) it makes them available on all platforms where the Lisp |
9b97b187c7e2
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
86202
diff
changeset
|
29 ;; functions used are available |
9b97b187c7e2
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
86202
diff
changeset
|
30 ;; |
9b97b187c7e2
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
86202
diff
changeset
|
31 ;; 2) it makes their functionality accessible and modified by the |
9b97b187c7e2
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
86202
diff
changeset
|
32 ;; Lisp programmer. |
9b97b187c7e2
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
86202
diff
changeset
|
33 ;; |
9b97b187c7e2
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
86202
diff
changeset
|
34 ;; 3) it allows Eshell to refrain from having to invoke external |
9b97b187c7e2
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
86202
diff
changeset
|
35 ;; processes for common operations. |
9b97b187c7e2
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
86202
diff
changeset
|
36 |
9b97b187c7e2
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
86202
diff
changeset
|
37 ;;; Code: |
9b97b187c7e2
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
86202
diff
changeset
|
38 |
55195
f243dc772a99
Add "(require 'eshell)", to get necessary features
Eli Zaretskii <eliz@gnu.org>
parents:
52401
diff
changeset
|
39 (require 'eshell) |
106390 | 40 (require 'esh-opt) |
41 (require 'pcomplete) | |
29876 | 42 |
95152
ad5d26b1d5d1
Use eshell-defgroup rather than defgroup.
Glenn Morris <rgm@gnu.org>
parents:
94661
diff
changeset
|
43 ;;;###autoload |
ad5d26b1d5d1
Use eshell-defgroup rather than defgroup.
Glenn Morris <rgm@gnu.org>
parents:
94661
diff
changeset
|
44 (eshell-defgroup eshell-unix nil |
29876 | 45 "This module defines many of the more common UNIX utilities as |
46 aliases implemented in Lisp. These include mv, ln, cp, rm, etc. If | |
47 the user passes arguments which are too complex, or are unrecognized | |
48 by the Lisp variant, the external version will be called (if | |
49 available). The only reason not to use them would be because they are | |
50 usually much slower. But in several cases their tight integration | |
51 with Eshell makes them more versatile than their traditional cousins | |
52 \(such as being able to use `kill' to kill Eshell background processes | |
53 by name)." | |
54 :tag "UNIX commands in Lisp" | |
55 :group 'eshell-module) | |
56 | |
57 (defcustom eshell-unix-load-hook '(eshell-unix-initialize) | |
110580
f57f72bb4757
Cosmetic doc fixes for eshell.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
58 "A list of functions to run when `eshell-unix' is loaded." |
29876 | 59 :type 'hook |
60 :group 'eshell-unix) | |
61 | |
62 (defcustom eshell-plain-grep-behavior nil | |
110580
f57f72bb4757
Cosmetic doc fixes for eshell.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
63 "If non-nil, standalone \"grep\" commands will behave normally. |
29876 | 64 Standalone in this context means not redirected, and not on the |
65 receiving side of a command pipeline." | |
66 :type 'boolean | |
67 :group 'eshell-unix) | |
68 | |
69 (defcustom eshell-no-grep-available (not (eshell-search-path "grep")) | |
110580
f57f72bb4757
Cosmetic doc fixes for eshell.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
70 "If non-nil, no grep is available on the current machine." |
29876 | 71 :type 'boolean |
72 :group 'eshell-unix) | |
73 | |
74 (defcustom eshell-plain-diff-behavior nil | |
110580
f57f72bb4757
Cosmetic doc fixes for eshell.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
75 "If non-nil, standalone \"diff\" commands will behave normally. |
29876 | 76 Standalone in this context means not redirected, and not on the |
77 receiving side of a command pipeline." | |
78 :type 'boolean | |
79 :group 'eshell-unix) | |
80 | |
86202
794e428cd497
* eshell/esh-util.el (eshell-under-xemacs-p): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
86106
diff
changeset
|
81 (defcustom eshell-plain-locate-behavior (featurep 'xemacs) |
110580
f57f72bb4757
Cosmetic doc fixes for eshell.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
82 "If non-nil, standalone \"locate\" commands will behave normally. |
29876 | 83 Standalone in this context means not redirected, and not on the |
84 receiving side of a command pipeline." | |
85 :type 'boolean | |
86 :group 'eshell-unix) | |
87 | |
88 (defcustom eshell-rm-removes-directories nil | |
110580
f57f72bb4757
Cosmetic doc fixes for eshell.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
89 "If non-nil, `rm' will remove directory entries. |
29876 | 90 Otherwise, `rmdir' is required." |
91 :type 'boolean | |
92 :group 'eshell-unix) | |
93 | |
94 (defcustom eshell-rm-interactive-query (= (user-uid) 0) | |
110580
f57f72bb4757
Cosmetic doc fixes for eshell.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
95 "If non-nil, `rm' will query before removing anything." |
29876 | 96 :type 'boolean |
97 :group 'eshell-unix) | |
98 | |
99 (defcustom eshell-mv-interactive-query (= (user-uid) 0) | |
110580
f57f72bb4757
Cosmetic doc fixes for eshell.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
100 "If non-nil, `mv' will query before overwriting anything." |
29876 | 101 :type 'boolean |
102 :group 'eshell-unix) | |
103 | |
104 (defcustom eshell-mv-overwrite-files t | |
110580
f57f72bb4757
Cosmetic doc fixes for eshell.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
105 "If non-nil, `mv' will overwrite files without warning." |
29876 | 106 :type 'boolean |
107 :group 'eshell-unix) | |
108 | |
109 (defcustom eshell-cp-interactive-query (= (user-uid) 0) | |
110580
f57f72bb4757
Cosmetic doc fixes for eshell.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
110 "If non-nil, `cp' will query before overwriting anything." |
29876 | 111 :type 'boolean |
112 :group 'eshell-unix) | |
113 | |
114 (defcustom eshell-cp-overwrite-files t | |
110580
f57f72bb4757
Cosmetic doc fixes for eshell.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
115 "If non-nil, `cp' will overwrite files without warning." |
29876 | 116 :type 'boolean |
117 :group 'eshell-unix) | |
118 | |
119 (defcustom eshell-ln-interactive-query (= (user-uid) 0) | |
110580
f57f72bb4757
Cosmetic doc fixes for eshell.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
120 "If non-nil, `ln' will query before overwriting anything." |
29876 | 121 :type 'boolean |
122 :group 'eshell-unix) | |
123 | |
31241 | 124 (defcustom eshell-ln-overwrite-files nil |
110580
f57f72bb4757
Cosmetic doc fixes for eshell.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
125 "If non-nil, `ln' will overwrite files without warning." |
29876 | 126 :type 'boolean |
127 :group 'eshell-unix) | |
128 | |
33020 | 129 (defcustom eshell-default-target-is-dot nil |
110580
f57f72bb4757
Cosmetic doc fixes for eshell.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
130 "If non-nil, the default destination for cp, mv or ln is `.'." |
33020 | 131 :type 'boolean |
132 :group 'eshell-unix) | |
133 | |
32446
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
134 (defcustom eshell-du-prefer-over-ange nil |
110580
f57f72bb4757
Cosmetic doc fixes for eshell.
Glenn Morris <rgm@gnu.org>
parents:
106815
diff
changeset
|
135 "Use Eshell's du in ange-ftp remote directories. |
32493
34d5d8707722
(eshell-du-prefer-over-ange): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
32446
diff
changeset
|
136 Otherwise, Emacs will attempt to use rsh to invoke du on the remote machine." |
32446
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
137 :type 'boolean |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
138 :group 'eshell-unix) |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
139 |
29876 | 140 ;;; Functions: |
141 | |
142 (defun eshell-unix-initialize () | |
143 "Initialize the UNIX support/emulation code." | |
144 (when (eshell-using-module 'eshell-cmpl) | |
145 (add-hook 'pcomplete-try-first-hook | |
33020 | 146 'eshell-complete-host-reference nil t)) |
147 (make-local-variable 'eshell-complex-commands) | |
148 (setq eshell-complex-commands | |
149 (append '("grep" "egrep" "fgrep" "agrep" "glimpse" "locate" | |
106286
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
150 "cat" "time" "cp" "mv" "make" "du" "diff" "su" "sudo") |
33020 | 151 eshell-complex-commands))) |
29876 | 152 |
153 (defalias 'eshell/date 'current-time-string) | |
154 (defalias 'eshell/basename 'file-name-nondirectory) | |
155 (defalias 'eshell/dirname 'file-name-directory) | |
156 | |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
157 (defvar em-interactive) |
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
158 (defvar em-preview) |
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
159 (defvar em-recursive) |
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
160 (defvar em-verbose) |
29876 | 161 |
162 (defun eshell/man (&rest args) | |
163 "Invoke man, flattening the arguments appropriately." | |
164 (funcall 'man (apply 'eshell-flatten-and-stringify args))) | |
165 | |
37661
6d7c89c79996
Set the property `eshell-no-numeric-conversions' on the following
John Wiegley <johnw@newartisans.com>
parents:
37655
diff
changeset
|
166 (put 'eshell/man 'eshell-no-numeric-conversions t) |
6d7c89c79996
Set the property `eshell-no-numeric-conversions' on the following
John Wiegley <johnw@newartisans.com>
parents:
37655
diff
changeset
|
167 |
83810
5ad1e235d4fa
James Wright <james at chumsley.org>
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
168 (defun eshell/info (&rest args) |
86106
29738c3df361
(eshell/info): Fix typos in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85660
diff
changeset
|
169 "Run the info command in-frame with the same behavior as command-line `info', ie: |
83810
5ad1e235d4fa
James Wright <james at chumsley.org>
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
170 'info' => goes to top info window |
5ad1e235d4fa
James Wright <james at chumsley.org>
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
171 'info arg1' => IF arg1 is a file, then visits arg1 |
5ad1e235d4fa
James Wright <james at chumsley.org>
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
172 'info arg1' => OTHERWISE goes to top info window and then menu item arg1 |
5ad1e235d4fa
James Wright <james at chumsley.org>
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
173 'info arg1 arg2' => does action for arg1 (either visit-file or menu-item) and then menu item arg2 |
5ad1e235d4fa
James Wright <james at chumsley.org>
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
174 etc." |
85503
59ee4068f60b
* progmodes/gud.el (gud-target-name): Move definition before use.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
83839
diff
changeset
|
175 (eval-and-compile (require 'info)) |
83810
5ad1e235d4fa
James Wright <james at chumsley.org>
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
176 (let ((file (cond |
5ad1e235d4fa
James Wright <james at chumsley.org>
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
177 ((not (stringp (car args))) |
5ad1e235d4fa
James Wright <james at chumsley.org>
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
178 nil) |
5ad1e235d4fa
James Wright <james at chumsley.org>
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
179 ((file-exists-p (expand-file-name (car args))) |
5ad1e235d4fa
James Wright <james at chumsley.org>
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
180 (expand-file-name (car args))) |
5ad1e235d4fa
James Wright <james at chumsley.org>
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
181 ((file-exists-p (concat (expand-file-name (car args)) ".info")) |
5ad1e235d4fa
James Wright <james at chumsley.org>
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
182 (concat (expand-file-name (car args)) ".info"))))) |
5ad1e235d4fa
James Wright <james at chumsley.org>
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
183 |
5ad1e235d4fa
James Wright <james at chumsley.org>
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
184 ;; If the first arg is a file, then go to that file's Top node |
5ad1e235d4fa
James Wright <james at chumsley.org>
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
185 ;; Otherwise, go to the global directory |
5ad1e235d4fa
James Wright <james at chumsley.org>
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
186 (if file |
5ad1e235d4fa
James Wright <james at chumsley.org>
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
187 (progn |
5ad1e235d4fa
James Wright <james at chumsley.org>
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
188 (setq args (cdr args)) |
5ad1e235d4fa
James Wright <james at chumsley.org>
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
189 (Info-find-node file "Top")) |
5ad1e235d4fa
James Wright <james at chumsley.org>
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
190 (Info-directory)) |
5ad1e235d4fa
James Wright <james at chumsley.org>
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
191 |
5ad1e235d4fa
James Wright <james at chumsley.org>
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
192 ;; Treat all remaining args as menu references |
5ad1e235d4fa
James Wright <james at chumsley.org>
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
193 (while args |
5ad1e235d4fa
James Wright <james at chumsley.org>
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
194 (Info-menu (car args)) |
5ad1e235d4fa
James Wright <james at chumsley.org>
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
195 (setq args (cdr args))))) |
5ad1e235d4fa
James Wright <james at chumsley.org>
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
196 |
29876 | 197 (defun eshell-remove-entries (path files &optional top-level) |
33020 | 198 "From PATH, remove all of the given FILES, perhaps interactively." |
29876 | 199 (while files |
200 (if (string-match "\\`\\.\\.?\\'" | |
201 (file-name-nondirectory (car files))) | |
202 (if top-level | |
203 (eshell-error "rm: cannot remove `.' or `..'\n")) | |
204 (if (and (file-directory-p (car files)) | |
205 (not (file-symlink-p (car files)))) | |
111144
f349e65969e5
Use recursive-trash feature for eshell deletion (Bug#7011).
Chong Yidong <cyd@stupidchicken.com>
parents:
110580
diff
changeset
|
206 (progn |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
207 (if em-verbose |
29876 | 208 (eshell-printn (format "rm: removing directory `%s'" |
209 (car files)))) | |
210 (unless | |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
211 (or em-preview |
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
212 (and em-interactive |
29876 | 213 (not (y-or-n-p |
214 (format "rm: remove directory `%s'? " | |
215 (car files)))))) | |
111144
f349e65969e5
Use recursive-trash feature for eshell deletion (Bug#7011).
Chong Yidong <cyd@stupidchicken.com>
parents:
110580
diff
changeset
|
216 (eshell-funcalln 'delete-directory (car files) t t))) |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
217 (if em-verbose |
29876 | 218 (eshell-printn (format "rm: removing file `%s'" |
219 (car files)))) | |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
220 (unless (or em-preview |
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
221 (and em-interactive |
29876 | 222 (not (y-or-n-p |
223 (format "rm: remove `%s'? " | |
224 (car files)))))) | |
111144
f349e65969e5
Use recursive-trash feature for eshell deletion (Bug#7011).
Chong Yidong <cyd@stupidchicken.com>
parents:
110580
diff
changeset
|
225 (eshell-funcalln 'delete-file (car files) t)))) |
29876 | 226 (setq files (cdr files)))) |
227 | |
228 (defun eshell/rm (&rest args) | |
229 "Implementation of rm in Lisp. | |
230 This is implemented to call either `delete-file', `kill-buffer', | |
231 `kill-process', or `unintern', depending on the nature of the | |
232 argument." | |
233 (setq args (eshell-flatten-list args)) | |
234 (eshell-eval-using-options | |
235 "rm" args | |
236 '((?h "help" nil nil "show this usage screen") | |
237 (?f "force" nil force-removal "force removal") | |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
238 (?i "interactive" nil em-interactive "prompt before any removal") |
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
239 (?n "preview" nil em-preview "don't change anything on disk") |
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
240 (?r "recursive" nil em-recursive |
29876 | 241 "remove the contents of directories recursively") |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
242 (?R nil nil em-recursive "(same)") |
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
243 (?v "verbose" nil em-verbose "explain what is being done") |
29876 | 244 :preserve-args |
245 :external "rm" | |
246 :show-usage | |
247 :usage "[OPTION]... FILE... | |
248 Remove (unlink) the FILE(s).") | |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
249 (unless em-interactive |
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
250 (setq em-interactive eshell-rm-interactive-query)) |
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
251 (if (and force-removal em-interactive) |
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
252 (setq em-interactive nil)) |
29876 | 253 (while args |
254 (let ((entry (if (stringp (car args)) | |
255 (directory-file-name (car args)) | |
256 (if (numberp (car args)) | |
257 (number-to-string (car args)) | |
258 (car args))))) | |
259 (cond | |
260 ((bufferp entry) | |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
261 (if em-verbose |
29876 | 262 (eshell-printn (format "rm: removing buffer `%s'" entry))) |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
263 (unless (or em-preview |
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
264 (and em-interactive |
29876 | 265 (not (y-or-n-p (format "rm: delete buffer `%s'? " |
266 entry))))) | |
267 (eshell-funcalln 'kill-buffer entry))) | |
31241 | 268 ((eshell-processp entry) |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
269 (if em-verbose |
29876 | 270 (eshell-printn (format "rm: killing process `%s'" entry))) |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
271 (unless (or em-preview |
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
272 (and em-interactive |
29876 | 273 (not (y-or-n-p (format "rm: kill process `%s'? " |
274 entry))))) | |
275 (eshell-funcalln 'kill-process entry))) | |
276 ((symbolp entry) | |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
277 (if em-verbose |
29876 | 278 (eshell-printn (format "rm: uninterning symbol `%s'" entry))) |
279 (unless | |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
280 (or em-preview |
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
281 (and em-interactive |
29876 | 282 (not (y-or-n-p (format "rm: unintern symbol `%s'? " |
283 entry))))) | |
284 (eshell-funcalln 'unintern entry))) | |
285 ((stringp entry) | |
286 (if (and (file-directory-p entry) | |
287 (not (file-symlink-p entry))) | |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
288 (if (or em-recursive |
29876 | 289 eshell-rm-removes-directories) |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
290 (if (or em-preview |
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
291 (not em-interactive) |
29876 | 292 (y-or-n-p |
293 (format "rm: descend into directory `%s'? " | |
294 entry))) | |
295 (eshell-remove-entries nil (list entry) t)) | |
296 (eshell-error (format "rm: %s: is a directory\n" entry))) | |
297 (eshell-remove-entries nil (list entry) t))))) | |
298 (setq args (cdr args))) | |
299 nil)) | |
300 | |
37661
6d7c89c79996
Set the property `eshell-no-numeric-conversions' on the following
John Wiegley <johnw@newartisans.com>
parents:
37655
diff
changeset
|
301 (put 'eshell/rm 'eshell-no-numeric-conversions t) |
6d7c89c79996
Set the property `eshell-no-numeric-conversions' on the following
John Wiegley <johnw@newartisans.com>
parents:
37655
diff
changeset
|
302 |
29876 | 303 (defun eshell/mkdir (&rest args) |
304 "Implementation of mkdir in Lisp." | |
305 (eshell-eval-using-options | |
306 "mkdir" args | |
307 '((?h "help" nil nil "show this usage screen") | |
308 :external "mkdir" | |
309 :show-usage | |
310 :usage "[OPTION] DIRECTORY... | |
311 Create the DIRECTORY(ies), if they do not already exist.") | |
312 (while args | |
313 (eshell-funcalln 'make-directory (car args)) | |
314 (setq args (cdr args))) | |
315 nil)) | |
316 | |
37661
6d7c89c79996
Set the property `eshell-no-numeric-conversions' on the following
John Wiegley <johnw@newartisans.com>
parents:
37655
diff
changeset
|
317 (put 'eshell/mkdir 'eshell-no-numeric-conversions t) |
6d7c89c79996
Set the property `eshell-no-numeric-conversions' on the following
John Wiegley <johnw@newartisans.com>
parents:
37655
diff
changeset
|
318 |
29876 | 319 (defun eshell/rmdir (&rest args) |
320 "Implementation of rmdir in Lisp." | |
321 (eshell-eval-using-options | |
322 "rmdir" args | |
323 '((?h "help" nil nil "show this usage screen") | |
324 :external "rmdir" | |
325 :show-usage | |
326 :usage "[OPTION] DIRECTORY... | |
327 Remove the DIRECTORY(ies), if they are empty.") | |
328 (while args | |
329 (eshell-funcalln 'delete-directory (car args)) | |
330 (setq args (cdr args))) | |
331 nil)) | |
332 | |
37661
6d7c89c79996
Set the property `eshell-no-numeric-conversions' on the following
John Wiegley <johnw@newartisans.com>
parents:
37655
diff
changeset
|
333 (put 'eshell/rmdir 'eshell-no-numeric-conversions t) |
6d7c89c79996
Set the property `eshell-no-numeric-conversions' on the following
John Wiegley <johnw@newartisans.com>
parents:
37655
diff
changeset
|
334 |
95619
45dbb3c749a6
Remove unnecessary eval-when-compiles and eval-and-compiles.
Glenn Morris <rgm@gnu.org>
parents:
95152
diff
changeset
|
335 (defvar no-dereference) |
29876 | 336 |
337 (defvar eshell-warn-dot-directories t) | |
338 | |
339 (defun eshell-shuffle-files (command action files target func deep &rest args) | |
340 "Shuffle around some filesystem entries, using FUNC to do the work." | |
32446
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
341 (let ((attr-target (eshell-file-attributes target)) |
29876 | 342 (is-dir (or (file-directory-p target) |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
343 (and em-preview (not eshell-warn-dot-directories)))) |
29876 | 344 attr) |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
345 (if (and (not em-preview) (not is-dir) |
29876 | 346 (> (length files) 1)) |
347 (error "%s: when %s multiple files, last argument must be a directory" | |
348 command action)) | |
349 (while files | |
350 (setcar files (directory-file-name (car files))) | |
351 (cond | |
352 ((string-match "\\`\\.\\.?\\'" | |
353 (file-name-nondirectory (car files))) | |
354 (if eshell-warn-dot-directories | |
355 (eshell-error (format "%s: %s: omitting directory\n" | |
356 command (car files))))) | |
357 ((and attr-target | |
30269
30829e002c1b
(eshell-shuffle-files): Don't disable
Eli Zaretskii <eliz@gnu.org>
parents:
29934
diff
changeset
|
358 (or (not (eshell-under-windows-p)) |
30829e002c1b
(eshell-shuffle-files): Don't disable
Eli Zaretskii <eliz@gnu.org>
parents:
29934
diff
changeset
|
359 (eq system-type 'ms-dos)) |
32446
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
360 (setq attr (eshell-file-attributes (car files))) |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
361 (nth 10 attr-target) (nth 10 attr) |
39293
1e91a5f60ae6
(eshell-shuffle-files, eshell-shuffle-files):
Eli Zaretskii <eliz@gnu.org>
parents:
39235
diff
changeset
|
362 ;; Use equal, not -, since the inode and the device could |
1e91a5f60ae6
(eshell-shuffle-files, eshell-shuffle-files):
Eli Zaretskii <eliz@gnu.org>
parents:
39235
diff
changeset
|
363 ;; cons cells. |
39235
f3a553d88ab7
(eshell-shuffle-files): Compare inodes with
Eli Zaretskii <eliz@gnu.org>
parents:
38414
diff
changeset
|
364 (equal (nth 10 attr-target) (nth 10 attr)) |
32446
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
365 (nth 11 attr-target) (nth 11 attr) |
39293
1e91a5f60ae6
(eshell-shuffle-files, eshell-shuffle-files):
Eli Zaretskii <eliz@gnu.org>
parents:
39235
diff
changeset
|
366 (equal (nth 11 attr-target) (nth 11 attr))) |
29876 | 367 (eshell-error (format "%s: `%s' and `%s' are the same file\n" |
368 command (car files) target))) | |
369 (t | |
370 (let ((source (car files)) | |
371 (target (if is-dir | |
372 (expand-file-name | |
373 (file-name-nondirectory (car files)) target) | |
374 target)) | |
375 link) | |
376 (if (and (file-directory-p source) | |
377 (or (not no-dereference) | |
378 (not (file-symlink-p source))) | |
379 (not (memq func '(make-symbolic-link | |
380 add-name-to-file)))) | |
381 (if (and (eq func 'copy-file) | |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
382 (not em-recursive)) |
29876 | 383 (eshell-error (format "%s: %s: omitting directory\n" |
384 command (car files))) | |
385 (let (eshell-warn-dot-directories) | |
386 (if (and (not deep) | |
387 (eq func 'rename-file) | |
39293
1e91a5f60ae6
(eshell-shuffle-files, eshell-shuffle-files):
Eli Zaretskii <eliz@gnu.org>
parents:
39235
diff
changeset
|
388 ;; Use equal, since the device might be a |
1e91a5f60ae6
(eshell-shuffle-files, eshell-shuffle-files):
Eli Zaretskii <eliz@gnu.org>
parents:
39235
diff
changeset
|
389 ;; cons cell. |
1e91a5f60ae6
(eshell-shuffle-files, eshell-shuffle-files):
Eli Zaretskii <eliz@gnu.org>
parents:
39235
diff
changeset
|
390 (equal (nth 11 (eshell-file-attributes |
1e91a5f60ae6
(eshell-shuffle-files, eshell-shuffle-files):
Eli Zaretskii <eliz@gnu.org>
parents:
39235
diff
changeset
|
391 (file-name-directory |
1e91a5f60ae6
(eshell-shuffle-files, eshell-shuffle-files):
Eli Zaretskii <eliz@gnu.org>
parents:
39235
diff
changeset
|
392 (directory-file-name |
1e91a5f60ae6
(eshell-shuffle-files, eshell-shuffle-files):
Eli Zaretskii <eliz@gnu.org>
parents:
39235
diff
changeset
|
393 (expand-file-name source))))) |
1e91a5f60ae6
(eshell-shuffle-files, eshell-shuffle-files):
Eli Zaretskii <eliz@gnu.org>
parents:
39235
diff
changeset
|
394 (nth 11 (eshell-file-attributes |
1e91a5f60ae6
(eshell-shuffle-files, eshell-shuffle-files):
Eli Zaretskii <eliz@gnu.org>
parents:
39235
diff
changeset
|
395 (file-name-directory |
1e91a5f60ae6
(eshell-shuffle-files, eshell-shuffle-files):
Eli Zaretskii <eliz@gnu.org>
parents:
39235
diff
changeset
|
396 (directory-file-name |
1e91a5f60ae6
(eshell-shuffle-files, eshell-shuffle-files):
Eli Zaretskii <eliz@gnu.org>
parents:
39235
diff
changeset
|
397 (expand-file-name target))))))) |
29876 | 398 (apply 'eshell-funcalln func source target args) |
399 (unless (file-directory-p target) | |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
400 (if em-verbose |
29876 | 401 (eshell-printn |
402 (format "%s: making directory %s" | |
403 command target))) | |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
404 (unless em-preview |
29876 | 405 (eshell-funcalln 'make-directory target))) |
31241 | 406 (apply 'eshell-shuffle-files |
407 command action | |
408 (mapcar | |
409 (function | |
410 (lambda (file) | |
411 (concat source "/" file))) | |
412 (directory-files source)) | |
413 target func t args) | |
29876 | 414 (when (eq func 'rename-file) |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
415 (if em-verbose |
29876 | 416 (eshell-printn |
417 (format "%s: deleting directory %s" | |
418 command source))) | |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
419 (unless em-preview |
29876 | 420 (eshell-funcalln 'delete-directory source)))))) |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
421 (if em-verbose |
29876 | 422 (eshell-printn (format "%s: %s -> %s" command |
423 source target))) | |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
424 (unless em-preview |
29876 | 425 (if (and no-dereference |
426 (setq link (file-symlink-p source))) | |
427 (progn | |
428 (apply 'eshell-funcalln 'make-symbolic-link | |
429 link target args) | |
430 (if (eq func 'rename-file) | |
431 (if (and (file-directory-p source) | |
432 (not (file-symlink-p source))) | |
433 (eshell-funcalln 'delete-directory source) | |
434 (eshell-funcalln 'delete-file source)))) | |
435 (apply 'eshell-funcalln func source target args))))))) | |
436 (setq files (cdr files))))) | |
437 | |
438 (defun eshell-shorthand-tar-command (command args) | |
439 "Rewrite `cp -v dir a.tar.gz' to `tar cvzf a.tar.gz dir'." | |
440 (let* ((archive (car (last args))) | |
441 (tar-args | |
442 (cond ((string-match "z2" archive) "If") | |
443 ((string-match "gz" archive) "zf") | |
444 ((string-match "\\(az\\|Z\\)" archive) "Zf") | |
445 (t "f")))) | |
446 (if (file-exists-p archive) | |
447 (setq tar-args (concat "u" tar-args)) | |
448 (setq tar-args (concat "c" tar-args))) | |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
449 (if em-verbose |
29876 | 450 (setq tar-args (concat "v" tar-args))) |
451 (if (equal command "mv") | |
452 (setq tar-args (concat "--remove-files -" tar-args))) | |
453 ;; truncate the archive name from the arguments | |
454 (setcdr (last args 2) nil) | |
455 (throw 'eshell-replace-command | |
456 (eshell-parse-command | |
457 (format "tar %s %s" tar-args archive) args)))) | |
458 | |
459 ;; this is to avoid duplicating code... | |
33020 | 460 (defmacro eshell-mvcpln-template (command action func query-var |
461 force-var &optional preserve) | |
462 `(let ((len (length args))) | |
463 (if (or (= len 0) | |
464 (and (= len 1) (null eshell-default-target-is-dot))) | |
465 (error "%s: missing destination file or directory" ,command)) | |
466 (if (= len 1) | |
467 (nconc args '("."))) | |
468 (setq args (eshell-stringify-list (eshell-flatten-list args))) | |
469 (if (and ,(not (equal command "ln")) | |
470 (string-match eshell-tar-regexp (car (last args))) | |
471 (or (> (length args) 2) | |
472 (and (file-directory-p (car args)) | |
473 (or (not no-dereference) | |
474 (not (file-symlink-p (car args))))))) | |
475 (eshell-shorthand-tar-command ,command args) | |
476 (let ((target (car (last args))) | |
477 ange-cache) | |
478 (setcdr (last args 2) nil) | |
479 (eshell-shuffle-files | |
480 ,command ,action args target ,func nil | |
481 ,@(append | |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
482 `((if (and (or em-interactive |
33020 | 483 ,query-var) |
484 (not force)) | |
485 1 (or force ,force-var))) | |
486 (if preserve | |
487 (list preserve))))) | |
488 nil))) | |
29876 | 489 |
490 (defun eshell/mv (&rest args) | |
491 "Implementation of mv in Lisp." | |
492 (eshell-eval-using-options | |
493 "mv" args | |
494 '((?f "force" nil force | |
495 "remove existing destinations, never prompt") | |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
496 (?i "interactive" nil em-interactive |
29876 | 497 "request confirmation if target already exists") |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
498 (?n "preview" nil em-preview |
29876 | 499 "don't change anything on disk") |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
500 (?v "verbose" nil em-verbose |
29876 | 501 "explain what is being done") |
502 (nil "help" nil nil "show this usage screen") | |
33020 | 503 :preserve-args |
29876 | 504 :external "mv" |
505 :show-usage | |
506 :usage "[OPTION]... SOURCE DEST | |
507 or: mv [OPTION]... SOURCE... DIRECTORY | |
508 Rename SOURCE to DEST, or move SOURCE(s) to DIRECTORY. | |
509 \[OPTION] DIRECTORY...") | |
510 (let ((no-dereference t)) | |
33020 | 511 (eshell-mvcpln-template "mv" "moving" 'rename-file |
512 eshell-mv-interactive-query | |
513 eshell-mv-overwrite-files)))) | |
29876 | 514 |
37661
6d7c89c79996
Set the property `eshell-no-numeric-conversions' on the following
John Wiegley <johnw@newartisans.com>
parents:
37655
diff
changeset
|
515 (put 'eshell/mv 'eshell-no-numeric-conversions t) |
6d7c89c79996
Set the property `eshell-no-numeric-conversions' on the following
John Wiegley <johnw@newartisans.com>
parents:
37655
diff
changeset
|
516 |
29876 | 517 (defun eshell/cp (&rest args) |
518 "Implementation of cp in Lisp." | |
519 (eshell-eval-using-options | |
520 "cp" args | |
521 '((?a "archive" nil archive | |
522 "same as -dpR") | |
523 (?d "no-dereference" nil no-dereference | |
524 "preserve links") | |
525 (?f "force" nil force | |
526 "remove existing destinations, never prompt") | |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
527 (?i "interactive" nil em-interactive |
29876 | 528 "request confirmation if target already exists") |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
529 (?n "preview" nil em-preview |
29876 | 530 "don't change anything on disk") |
531 (?p "preserve" nil preserve | |
532 "preserve file attributes if possible") | |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
533 (?R "recursive" nil em-recursive |
29876 | 534 "copy directories recursively") |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
535 (?v "verbose" nil em-verbose |
29876 | 536 "explain what is being done") |
537 (nil "help" nil nil "show this usage screen") | |
33020 | 538 :preserve-args |
29876 | 539 :external "cp" |
540 :show-usage | |
541 :usage "[OPTION]... SOURCE DEST | |
542 or: cp [OPTION]... SOURCE... DIRECTORY | |
543 Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.") | |
544 (if archive | |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
545 (setq preserve t no-dereference t em-recursive t)) |
33020 | 546 (eshell-mvcpln-template "cp" "copying" 'copy-file |
547 eshell-cp-interactive-query | |
548 eshell-cp-overwrite-files preserve))) | |
29876 | 549 |
37661
6d7c89c79996
Set the property `eshell-no-numeric-conversions' on the following
John Wiegley <johnw@newartisans.com>
parents:
37655
diff
changeset
|
550 (put 'eshell/cp 'eshell-no-numeric-conversions t) |
6d7c89c79996
Set the property `eshell-no-numeric-conversions' on the following
John Wiegley <johnw@newartisans.com>
parents:
37655
diff
changeset
|
551 |
29876 | 552 (defun eshell/ln (&rest args) |
553 "Implementation of ln in Lisp." | |
554 (eshell-eval-using-options | |
555 "ln" args | |
556 '((?h "help" nil nil "show this usage screen") | |
557 (?s "symbolic" nil symbolic | |
558 "make symbolic links instead of hard links") | |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
559 (?i "interactive" nil em-interactive |
33020 | 560 "request confirmation if target already exists") |
29876 | 561 (?f "force" nil force "remove existing destinations, never prompt") |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
562 (?n "preview" nil em-preview |
29876 | 563 "don't change anything on disk") |
111455
f21190964294
Silence compilation of some shell files.
Glenn Morris <rgm@gnu.org>
parents:
111144
diff
changeset
|
564 (?v "verbose" nil em-verbose "explain what is being done") |
33020 | 565 :preserve-args |
29876 | 566 :external "ln" |
567 :show-usage | |
568 :usage "[OPTION]... TARGET [LINK_NAME] | |
569 or: ln [OPTION]... TARGET... DIRECTORY | |
570 Create a link to the specified TARGET with optional LINK_NAME. If there is | |
571 more than one TARGET, the last argument must be a directory; create links | |
572 in DIRECTORY to each TARGET. Create hard links by default, symbolic links | |
573 with '--symbolic'. When creating hard links, each TARGET must exist.") | |
33020 | 574 (let ((no-dereference t)) |
575 (eshell-mvcpln-template "ln" "linking" | |
576 (if symbolic | |
577 'make-symbolic-link | |
578 'add-name-to-file) | |
579 eshell-ln-interactive-query | |
580 eshell-ln-overwrite-files)))) | |
29876 | 581 |
37661
6d7c89c79996
Set the property `eshell-no-numeric-conversions' on the following
John Wiegley <johnw@newartisans.com>
parents:
37655
diff
changeset
|
582 (put 'eshell/ln 'eshell-no-numeric-conversions t) |
6d7c89c79996
Set the property `eshell-no-numeric-conversions' on the following
John Wiegley <johnw@newartisans.com>
parents:
37655
diff
changeset
|
583 |
29876 | 584 (defun eshell/cat (&rest args) |
32446
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
585 "Implementation of cat in Lisp. |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
586 If in a pipeline, or the file is not a regular file, directory or |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
587 symlink, then revert to the system's definition of cat." |
33020 | 588 (setq args (eshell-stringify-list (eshell-flatten-list args))) |
32446
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
589 (if (or eshell-in-pipeline-p |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
590 (catch 'special |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
591 (eshell-for arg args |
39985
3a906538d254
(eshell/cat): Do a quick test if something is a regular file, before
John Wiegley <johnw@newartisans.com>
parents:
39293
diff
changeset
|
592 (unless (or (and (stringp arg) |
3a906538d254
(eshell/cat): Do a quick test if something is a regular file, before
John Wiegley <johnw@newartisans.com>
parents:
39293
diff
changeset
|
593 (> (length arg) 0) |
3a906538d254
(eshell/cat): Do a quick test if something is a regular file, before
John Wiegley <johnw@newartisans.com>
parents:
39293
diff
changeset
|
594 (eq (aref arg 0) ?-)) |
3a906538d254
(eshell/cat): Do a quick test if something is a regular file, before
John Wiegley <johnw@newartisans.com>
parents:
39293
diff
changeset
|
595 (let ((attrs (eshell-file-attributes arg))) |
3a906538d254
(eshell/cat): Do a quick test if something is a regular file, before
John Wiegley <johnw@newartisans.com>
parents:
39293
diff
changeset
|
596 (and attrs (memq (aref (nth 8 attrs) 0) |
3a906538d254
(eshell/cat): Do a quick test if something is a regular file, before
John Wiegley <johnw@newartisans.com>
parents:
39293
diff
changeset
|
597 '(?d ?l ?-))))) |
32446
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
598 (throw 'special t))))) |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
599 (let ((ext-cat (eshell-search-path "cat"))) |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
600 (if ext-cat |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
601 (throw 'eshell-replace-command |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
602 (eshell-parse-command ext-cat args)) |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
603 (if eshell-in-pipeline-p |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
604 (error "Eshell's `cat' does not work in pipelines") |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
605 (error "Eshell's `cat' cannot display one of the files given")))) |
29876 | 606 (eshell-init-print-buffer) |
607 (eshell-eval-using-options | |
608 "cat" args | |
609 '((?h "help" nil nil "show this usage screen") | |
610 :external "cat" | |
611 :show-usage | |
612 :usage "[OPTION] FILE... | |
613 Concatenate FILE(s), or standard input, to standard output.") | |
614 (eshell-for file args | |
615 (if (string= file "-") | |
616 (throw 'eshell-external | |
617 (eshell-external-command "cat" args)))) | |
618 (let ((curbuf (current-buffer))) | |
619 (eshell-for file args | |
620 (with-temp-buffer | |
621 (insert-file-contents file) | |
622 (goto-char (point-min)) | |
623 (while (not (eobp)) | |
624 (let ((str (buffer-substring | |
625 (point) (min (1+ (line-end-position)) | |
626 (point-max))))) | |
627 (with-current-buffer curbuf | |
628 (eshell-buffered-print str))) | |
629 (forward-line))))) | |
630 (eshell-flush) | |
631 ;; if the file does not end in a newline, do not emit one | |
632 (setq eshell-ensure-newline-p nil)))) | |
633 | |
37661
6d7c89c79996
Set the property `eshell-no-numeric-conversions' on the following
John Wiegley <johnw@newartisans.com>
parents:
37655
diff
changeset
|
634 (put 'eshell/cat 'eshell-no-numeric-conversions t) |
6d7c89c79996
Set the property `eshell-no-numeric-conversions' on the following
John Wiegley <johnw@newartisans.com>
parents:
37655
diff
changeset
|
635 |
29876 | 636 ;; special front-end functions for compilation-mode buffers |
637 | |
638 (defun eshell/make (&rest args) | |
639 "Use `compile' to do background makes." | |
640 (if (and eshell-current-subjob-p | |
641 (eshell-interactive-output-p)) | |
642 (let ((compilation-process-setup-function | |
643 (list 'lambda nil | |
644 (list 'setq 'process-environment | |
645 (list 'quote (eshell-copy-environment)))))) | |
646 (compile (concat "make " (eshell-flatten-and-stringify args)))) | |
647 (throw 'eshell-replace-command | |
33020 | 648 (eshell-parse-command "*make" (eshell-stringify-list |
649 (eshell-flatten-list args)))))) | |
29876 | 650 |
37661
6d7c89c79996
Set the property `eshell-no-numeric-conversions' on the following
John Wiegley <johnw@newartisans.com>
parents:
37655
diff
changeset
|
651 (put 'eshell/make 'eshell-no-numeric-conversions t) |
6d7c89c79996
Set the property `eshell-no-numeric-conversions' on the following
John Wiegley <johnw@newartisans.com>
parents:
37655
diff
changeset
|
652 |
29876 | 653 (defun eshell-occur-mode-goto-occurrence () |
654 "Go to the occurrence the current line describes." | |
655 (interactive) | |
656 (let ((pos (occur-mode-find-occurrence))) | |
657 (pop-to-buffer (marker-buffer pos)) | |
658 (goto-char (marker-position pos)))) | |
659 | |
660 (defun eshell-occur-mode-mouse-goto (event) | |
661 "In Occur mode, go to the occurrence whose line you click on." | |
662 (interactive "e") | |
47597
8094bb2ffe5b
(eshell-occur-mode-mouse-goto, eshell-poor-mans-grep): Remove references to
Juanma Barranquero <lekktu@gmail.com>
parents:
45734
diff
changeset
|
663 (let (pos) |
105829
328150f0cf76
* url-util.el (url-insert-entities-in-string):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
100908
diff
changeset
|
664 (with-current-buffer (window-buffer (posn-window (event-end event))) |
29876 | 665 (save-excursion |
666 (goto-char (posn-point (event-end event))) | |
47597
8094bb2ffe5b
(eshell-occur-mode-mouse-goto, eshell-poor-mans-grep): Remove references to
Juanma Barranquero <lekktu@gmail.com>
parents:
45734
diff
changeset
|
667 (setq pos (occur-mode-find-occurrence)))) |
29876 | 668 (pop-to-buffer (marker-buffer pos)) |
669 (goto-char (marker-position pos)))) | |
670 | |
671 (defun eshell-poor-mans-grep (args) | |
672 "A poor version of grep that opens every file and uses `occur'. | |
673 This eats up memory, since it leaves the buffers open (to speed future | |
674 searches), and it's very slow. But, if your system has no grep | |
675 available..." | |
676 (save-selected-window | |
677 (let ((default-dir default-directory)) | |
678 (with-current-buffer (get-buffer-create "*grep*") | |
679 (let ((inhibit-read-only t) | |
680 (default-directory default-dir)) | |
681 (erase-buffer) | |
682 (occur-mode) | |
33020 | 683 (let ((files (eshell-stringify-list |
684 (eshell-flatten-list (cdr args)))) | |
29876 | 685 (inhibit-redisplay t) |
686 string) | |
687 (when (car args) | |
688 (if (get-buffer "*Occur*") | |
689 (kill-buffer (get-buffer "*Occur*"))) | |
690 (setq string nil) | |
691 (while files | |
692 (with-current-buffer (find-file-noselect (car files)) | |
693 (save-excursion | |
694 (ignore-errors | |
695 (occur (car args)))) | |
696 (if (get-buffer "*Occur*") | |
697 (with-current-buffer (get-buffer "*Occur*") | |
698 (setq string (buffer-string)) | |
699 (kill-buffer (current-buffer))))) | |
700 (if string (insert string)) | |
701 (setq string nil | |
702 files (cdr files))))) | |
703 (local-set-key [mouse-2] 'eshell-occur-mode-mouse-goto) | |
704 (local-set-key [(control ?c) (control ?c)] | |
705 'eshell-occur-mode-goto-occurrence) | |
706 (local-set-key [(control ?m)] | |
707 'eshell-occur-mode-goto-occurrence) | |
708 (local-set-key [return] 'eshell-occur-mode-goto-occurrence) | |
709 (pop-to-buffer (current-buffer) t) | |
710 (goto-char (point-min)) | |
711 (resize-temp-buffer-window)))))) | |
712 | |
713 (defun eshell-grep (command args &optional maybe-use-occur) | |
714 "Generic service function for the various grep aliases. | |
715 It calls Emacs' grep utility if the command is not redirecting output, | |
716 and if it's not part of a command pipeline. Otherwise, it calls the | |
717 external command." | |
718 (if (and maybe-use-occur eshell-no-grep-available) | |
719 (eshell-poor-mans-grep args) | |
720 (if (or eshell-plain-grep-behavior | |
721 (not (and (eshell-interactive-output-p) | |
722 (not eshell-in-pipeline-p) | |
723 (not eshell-in-subcommand-p)))) | |
724 (throw 'eshell-replace-command | |
31241 | 725 (eshell-parse-command (concat "*" command) |
33020 | 726 (eshell-stringify-list |
727 (eshell-flatten-list args)))) | |
57604
c72da3dd9a8d
(eshell-grep): Don't bind compilation-process-setup-function.
Richard M. Stallman <rms@gnu.org>
parents:
55195
diff
changeset
|
728 (let* ((args (mapconcat 'identity |
29876 | 729 (mapcar 'shell-quote-argument |
33020 | 730 (eshell-stringify-list |
731 (eshell-flatten-list args))) | |
29876 | 732 " ")) |
733 (cmd (progn | |
734 (set-text-properties 0 (length args) | |
735 '(invisible t) args) | |
736 (format "%s -n %s" command args))) | |
737 compilation-scroll-output) | |
738 (grep cmd))))) | |
739 | |
740 (defun eshell/grep (&rest args) | |
741 "Use Emacs grep facility instead of calling external grep." | |
742 (eshell-grep "grep" args t)) | |
743 | |
744 (defun eshell/egrep (&rest args) | |
745 "Use Emacs grep facility instead of calling external egrep." | |
746 (eshell-grep "egrep" args t)) | |
747 | |
748 (defun eshell/fgrep (&rest args) | |
749 "Use Emacs grep facility instead of calling external fgrep." | |
750 (eshell-grep "fgrep" args t)) | |
751 | |
752 (defun eshell/agrep (&rest args) | |
753 "Use Emacs grep facility instead of calling external agrep." | |
754 (eshell-grep "agrep" args)) | |
755 | |
756 (defun eshell/glimpse (&rest args) | |
757 "Use Emacs grep facility instead of calling external glimpse." | |
758 (let (null-device) | |
759 (eshell-grep "glimpse" (append '("-z" "-y") args)))) | |
760 | |
761 ;; completions rules for some common UNIX commands | |
762 | |
763 (defsubst eshell-complete-hostname () | |
764 "Complete a command that wants a hostname for an argument." | |
765 (pcomplete-here (eshell-read-host-names))) | |
766 | |
767 (defun eshell-complete-host-reference () | |
768 "If there is a host reference, complete it." | |
769 (let ((arg (pcomplete-actual-arg)) | |
770 index) | |
771 (when (setq index (string-match "@[a-z.]*\\'" arg)) | |
772 (setq pcomplete-stub (substring arg (1+ index)) | |
773 pcomplete-last-completion-raw t) | |
774 (throw 'pcomplete-completions (eshell-read-host-names))))) | |
775 | |
776 (defalias 'pcomplete/ftp 'eshell-complete-hostname) | |
777 (defalias 'pcomplete/ncftp 'eshell-complete-hostname) | |
778 (defalias 'pcomplete/ping 'eshell-complete-hostname) | |
779 (defalias 'pcomplete/rlogin 'eshell-complete-hostname) | |
780 | |
781 (defun pcomplete/telnet () | |
782 (require 'pcmpl-unix) | |
783 (pcomplete-opt "xl(pcmpl-unix-user-names)") | |
784 (eshell-complete-hostname)) | |
785 | |
786 (defun pcomplete/rsh () | |
787 "Complete `rsh', which, after the user and hostname, is like xargs." | |
788 (require 'pcmpl-unix) | |
789 (pcomplete-opt "l(pcmpl-unix-user-names)") | |
790 (eshell-complete-hostname) | |
791 (pcomplete-here (funcall pcomplete-command-completion-function)) | |
792 (funcall (or (pcomplete-find-completion-function (pcomplete-arg 1)) | |
793 pcomplete-default-completion-function))) | |
794 | |
795 (defalias 'pcomplete/ssh 'pcomplete/rsh) | |
796 | |
95619
45dbb3c749a6
Remove unnecessary eval-when-compiles and eval-and-compiles.
Glenn Morris <rgm@gnu.org>
parents:
95152
diff
changeset
|
797 (defvar block-size) |
45dbb3c749a6
Remove unnecessary eval-when-compiles and eval-and-compiles.
Glenn Morris <rgm@gnu.org>
parents:
95152
diff
changeset
|
798 (defvar by-bytes) |
45dbb3c749a6
Remove unnecessary eval-when-compiles and eval-and-compiles.
Glenn Morris <rgm@gnu.org>
parents:
95152
diff
changeset
|
799 (defvar dereference-links) |
45dbb3c749a6
Remove unnecessary eval-when-compiles and eval-and-compiles.
Glenn Morris <rgm@gnu.org>
parents:
95152
diff
changeset
|
800 (defvar grand-total) |
45dbb3c749a6
Remove unnecessary eval-when-compiles and eval-and-compiles.
Glenn Morris <rgm@gnu.org>
parents:
95152
diff
changeset
|
801 (defvar human-readable) |
45dbb3c749a6
Remove unnecessary eval-when-compiles and eval-and-compiles.
Glenn Morris <rgm@gnu.org>
parents:
95152
diff
changeset
|
802 (defvar max-depth) |
45dbb3c749a6
Remove unnecessary eval-when-compiles and eval-and-compiles.
Glenn Morris <rgm@gnu.org>
parents:
95152
diff
changeset
|
803 (defvar only-one-filesystem) |
45dbb3c749a6
Remove unnecessary eval-when-compiles and eval-and-compiles.
Glenn Morris <rgm@gnu.org>
parents:
95152
diff
changeset
|
804 (defvar show-all) |
29876 | 805 |
806 (defsubst eshell-du-size-string (size) | |
807 (let* ((str (eshell-printable-size size human-readable block-size t)) | |
808 (len (length str))) | |
809 (concat str (if (< len 8) | |
810 (make-string (- 8 len) ? ))))) | |
811 | |
812 (defun eshell-du-sum-directory (path depth) | |
813 "Summarize PATH, and its member directories." | |
814 (let ((entries (eshell-directory-files-and-attributes path)) | |
815 (size 0.0)) | |
816 (while entries | |
817 (unless (string-match "\\`\\.\\.?\\'" (caar entries)) | |
57742
7e9025771254
(eshell-du-sum-directory): Don't use directory-sep-char.
Richard M. Stallman <rms@gnu.org>
parents:
57604
diff
changeset
|
818 (let* ((entry (concat path "/" |
29876 | 819 (caar entries))) |
820 (symlink (and (stringp (cadr (car entries))) | |
821 (cadr (car entries))))) | |
822 (unless (or (and symlink (not dereference-links)) | |
823 (and only-one-filesystem | |
31241 | 824 (/= only-one-filesystem |
825 (nth 12 (car entries))))) | |
29876 | 826 (if symlink |
827 (setq entry symlink)) | |
828 (setq size | |
829 (+ size | |
830 (if (eq t (cadr (car entries))) | |
831 (eshell-du-sum-directory entry (1+ depth)) | |
832 (let ((file-size (nth 8 (car entries)))) | |
833 (prog1 | |
834 file-size | |
835 (if show-all | |
836 (eshell-print | |
837 (concat (eshell-du-size-string file-size) | |
838 entry "\n"))))))))))) | |
839 (setq entries (cdr entries))) | |
840 (if (or (not max-depth) | |
841 (= depth max-depth) | |
842 (= depth 0)) | |
843 (eshell-print (concat (eshell-du-size-string size) | |
844 (directory-file-name path) "\n"))) | |
845 size)) | |
846 | |
847 (defun eshell/du (&rest args) | |
31241 | 848 "Implementation of \"du\" in Lisp, passing ARGS." |
32446
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
849 (setq args (if args |
33020 | 850 (eshell-stringify-list (eshell-flatten-list args)) |
32446
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
851 '("."))) |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
852 (let ((ext-du (eshell-search-path "du"))) |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
853 (if (and ext-du |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
854 (not (catch 'have-ange-path |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
855 (eshell-for arg args |
106219
16b061d2742d
Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents:
105829
diff
changeset
|
856 (if (string-equal |
16b061d2742d
Improve handling of processes on remote hosts.
Michael Albinus <michael.albinus@gmx.de>
parents:
105829
diff
changeset
|
857 (file-remote-p (expand-file-name arg) 'method) "ftp") |
32446
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
858 (throw 'have-ange-path t)))))) |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
859 (throw 'eshell-replace-command |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
860 (eshell-parse-command ext-du args)) |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
861 (eshell-eval-using-options |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
862 "du" args |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
863 '((?a "all" nil show-all |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
864 "write counts for all files, not just directories") |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
865 (nil "block-size" t block-size |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
866 "use SIZE-byte blocks (i.e., --block-size SIZE)") |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
867 (?b "bytes" nil by-bytes |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
868 "print size in bytes") |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
869 (?c "total" nil grand-total |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
870 "produce a grand total") |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
871 (?d "max-depth" t max-depth |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
872 "display data only this many levels of data") |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
873 (?h "human-readable" 1024 human-readable |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
874 "print sizes in human readable format") |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
875 (?H "is" 1000 human-readable |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
876 "likewise, but use powers of 1000 not 1024") |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
877 (?k "kilobytes" 1024 block-size |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
878 "like --block-size 1024") |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
879 (?L "dereference" nil dereference-links |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
880 "dereference all symbolic links") |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
881 (?m "megabytes" 1048576 block-size |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
882 "like --block-size 1048576") |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
883 (?s "summarize" 0 max-depth |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
884 "display only a total for each argument") |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
885 (?x "one-file-system" nil only-one-filesystem |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
886 "skip directories on different filesystems") |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
887 (nil "help" nil nil |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
888 "show this usage screen") |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
889 :external "du" |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
890 :usage "[OPTION]... FILE... |
29876 | 891 Summarize disk usage of each FILE, recursively for directories.") |
32446
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
892 (unless by-bytes |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
893 (setq block-size (or block-size 1024))) |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
894 (if (and max-depth (stringp max-depth)) |
62915
b89e30bcd2bb
Changed all uses of `directory-sep-char' to ?/, and all uses of
John Wiegley <johnw@newartisans.com>
parents:
57742
diff
changeset
|
895 (setq max-depth (string-to-number max-depth))) |
32446
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
896 ;; filesystem support means nothing under Windows |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
897 (if (eshell-under-windows-p) |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
898 (setq only-one-filesystem nil)) |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
899 (let ((size 0.0) ange-cache) |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
900 (while args |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
901 (if only-one-filesystem |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
902 (setq only-one-filesystem |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
903 (nth 11 (eshell-file-attributes |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
904 (file-name-as-directory (car args)))))) |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
905 (setq size (+ size (eshell-du-sum-directory |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
906 (directory-file-name (car args)) 0))) |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
907 (setq args (cdr args))) |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
908 (if grand-total |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
909 (eshell-print (concat (eshell-du-size-string size) |
aab90b31807c
Added better remote directory support to Eshell, as well as a few bug
John Wiegley <johnw@newartisans.com>
parents:
31241
diff
changeset
|
910 "total\n")))))))) |
29876 | 911 |
912 (defvar eshell-time-start nil) | |
913 | |
914 (defun eshell-show-elapsed-time () | |
111456
646142bd4c38
Replace some eshell functions that duplicate standard functions.
Glenn Morris <rgm@gnu.org>
parents:
111455
diff
changeset
|
915 (let ((elapsed (format "%.3f secs\n" (- (float-time) eshell-time-start)))) |
29876 | 916 (set-text-properties 0 (length elapsed) '(face bold) elapsed) |
917 (eshell-interactive-print elapsed)) | |
918 (remove-hook 'eshell-post-command-hook 'eshell-show-elapsed-time t)) | |
919 | |
920 (defun eshell/time (&rest args) | |
921 "Implementation of \"time\" in Lisp." | |
922 (let ((time-args (copy-alist args)) | |
923 (continue t) | |
924 last-arg) | |
925 (while (and continue args) | |
926 (if (not (string-match "^-" (car args))) | |
927 (progn | |
928 (if last-arg | |
929 (setcdr last-arg nil) | |
930 (setq args '(""))) | |
931 (setq continue nil)) | |
932 (setq last-arg args | |
933 args (cdr args)))) | |
934 (eshell-eval-using-options | |
935 "time" args | |
936 '((?h "help" nil nil "show this usage screen") | |
937 :external "time" | |
938 :show-usage | |
939 :usage "COMMAND... | |
940 Show wall-clock time elapsed during execution of COMMAND.") | |
111456
646142bd4c38
Replace some eshell functions that duplicate standard functions.
Glenn Morris <rgm@gnu.org>
parents:
111455
diff
changeset
|
941 (setq eshell-time-start (float-time)) |
29876 | 942 (add-hook 'eshell-post-command-hook 'eshell-show-elapsed-time nil t) |
943 ;; after setting | |
944 (throw 'eshell-replace-command | |
78715
eae42b4923bd
(eshell/time): Stringify and flatten the non-command arguments.
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
945 (eshell-parse-command (car time-args) |
eae42b4923bd
(eshell/time): Stringify and flatten the non-command arguments.
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
946 ;;; http://lists.gnu.org/archive/html/bug-gnu-emacs/2007-08/msg00205.html |
eae42b4923bd
(eshell/time): Stringify and flatten the non-command arguments.
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
947 (eshell-stringify-list |
eae42b4923bd
(eshell/time): Stringify and flatten the non-command arguments.
Glenn Morris <rgm@gnu.org>
parents:
78220
diff
changeset
|
948 (eshell-flatten-list (cdr time-args)))))))) |
29876 | 949 |
106311
12c2a6b10caf
* eshell/em-unix (eshell/whoami): Make it a defun but a defalias.
Michael Albinus <michael.albinus@gmx.de>
parents:
106286
diff
changeset
|
950 (defun eshell/whoami (&rest args) |
12c2a6b10caf
* eshell/em-unix (eshell/whoami): Make it a defun but a defalias.
Michael Albinus <michael.albinus@gmx.de>
parents:
106286
diff
changeset
|
951 "Make \"whoami\" Tramp aware." |
12c2a6b10caf
* eshell/em-unix (eshell/whoami): Make it a defun but a defalias.
Michael Albinus <michael.albinus@gmx.de>
parents:
106286
diff
changeset
|
952 (or (file-remote-p default-directory 'user) (user-login-name))) |
29876 | 953 |
954 (defvar eshell-diff-window-config nil) | |
955 | |
956 (defun eshell-diff-quit () | |
957 "Restore the window configuration previous to diff'ing." | |
958 (interactive) | |
959 (if eshell-diff-window-config | |
960 (set-window-configuration eshell-diff-window-config))) | |
961 | |
85660
7dd9ef0af1e0
(nil-blank-string): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
85659
diff
changeset
|
962 (defun nil-blank-string (string) |
7dd9ef0af1e0
(nil-blank-string): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
85659
diff
changeset
|
963 "Return STRING, or nil if STRING contains only non-blank characters." |
85659
be317780de60
2007-10-26 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
85503
diff
changeset
|
964 (cond |
85660
7dd9ef0af1e0
(nil-blank-string): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
85659
diff
changeset
|
965 ((string-match "[^[:blank:]]" string) string) |
7dd9ef0af1e0
(nil-blank-string): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
85659
diff
changeset
|
966 (nil))) |
85659
be317780de60
2007-10-26 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
85503
diff
changeset
|
967 |
29876 | 968 (defun eshell/diff (&rest args) |
969 "Alias \"diff\" to call Emacs `diff' function." | |
33020 | 970 (let ((orig-args (eshell-stringify-list (eshell-flatten-list args)))) |
31241 | 971 (if (or eshell-plain-diff-behavior |
972 (not (and (eshell-interactive-output-p) | |
973 (not eshell-in-pipeline-p) | |
974 (not eshell-in-subcommand-p)))) | |
975 (throw 'eshell-replace-command | |
976 (eshell-parse-command "*diff" orig-args)) | |
45734
72f226ee8247
(eshell/diff): Use copy-sequence.
Richard M. Stallman <rms@gnu.org>
parents:
43334
diff
changeset
|
977 (setq args (copy-sequence orig-args)) |
31241 | 978 (if (< (length args) 2) |
979 (throw 'eshell-replace-command | |
980 (eshell-parse-command "*diff" orig-args))) | |
981 (let ((old (car (last args 2))) | |
982 (new (car (last args))) | |
983 (config (current-window-configuration))) | |
984 (if (= (length args) 2) | |
985 (setq args nil) | |
986 (setcdr (last args 3) nil)) | |
987 (with-current-buffer | |
988 (condition-case err | |
85659
be317780de60
2007-10-26 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
85503
diff
changeset
|
989 (diff old new |
be317780de60
2007-10-26 John Wiegley <johnw@newartisans.com>
John Wiegley <johnw@newartisans.com>
parents:
85503
diff
changeset
|
990 (nil-blank-string (eshell-flatten-and-stringify args))) |
31241 | 991 (error |
992 (throw 'eshell-replace-command | |
993 (eshell-parse-command "*diff" orig-args)))) | |
994 (when (fboundp 'diff-mode) | |
37441
565e55bc8630
(eshell/diff): Fixed problems that were occurring with Emacs 21's
John Wiegley <johnw@newartisans.com>
parents:
35588
diff
changeset
|
995 (make-local-variable 'compilation-finish-functions) |
565e55bc8630
(eshell/diff): Fixed problems that were occurring with Emacs 21's
John Wiegley <johnw@newartisans.com>
parents:
35588
diff
changeset
|
996 (add-hook |
565e55bc8630
(eshell/diff): Fixed problems that were occurring with Emacs 21's
John Wiegley <johnw@newartisans.com>
parents:
35588
diff
changeset
|
997 'compilation-finish-functions |
565e55bc8630
(eshell/diff): Fixed problems that were occurring with Emacs 21's
John Wiegley <johnw@newartisans.com>
parents:
35588
diff
changeset
|
998 `(lambda (buff msg) |
565e55bc8630
(eshell/diff): Fixed problems that were occurring with Emacs 21's
John Wiegley <johnw@newartisans.com>
parents:
35588
diff
changeset
|
999 (with-current-buffer buff |
565e55bc8630
(eshell/diff): Fixed problems that were occurring with Emacs 21's
John Wiegley <johnw@newartisans.com>
parents:
35588
diff
changeset
|
1000 (diff-mode) |
565e55bc8630
(eshell/diff): Fixed problems that were occurring with Emacs 21's
John Wiegley <johnw@newartisans.com>
parents:
35588
diff
changeset
|
1001 (set (make-local-variable 'eshell-diff-window-config) |
565e55bc8630
(eshell/diff): Fixed problems that were occurring with Emacs 21's
John Wiegley <johnw@newartisans.com>
parents:
35588
diff
changeset
|
1002 ,config) |
565e55bc8630
(eshell/diff): Fixed problems that were occurring with Emacs 21's
John Wiegley <johnw@newartisans.com>
parents:
35588
diff
changeset
|
1003 (local-set-key [?q] 'eshell-diff-quit) |
565e55bc8630
(eshell/diff): Fixed problems that were occurring with Emacs 21's
John Wiegley <johnw@newartisans.com>
parents:
35588
diff
changeset
|
1004 (if (fboundp 'turn-on-font-lock-if-enabled) |
565e55bc8630
(eshell/diff): Fixed problems that were occurring with Emacs 21's
John Wiegley <johnw@newartisans.com>
parents:
35588
diff
changeset
|
1005 (turn-on-font-lock-if-enabled)) |
565e55bc8630
(eshell/diff): Fixed problems that were occurring with Emacs 21's
John Wiegley <johnw@newartisans.com>
parents:
35588
diff
changeset
|
1006 (goto-char (point-min)))))) |
565e55bc8630
(eshell/diff): Fixed problems that were occurring with Emacs 21's
John Wiegley <johnw@newartisans.com>
parents:
35588
diff
changeset
|
1007 (pop-to-buffer (current-buffer)))))) |
565e55bc8630
(eshell/diff): Fixed problems that were occurring with Emacs 21's
John Wiegley <johnw@newartisans.com>
parents:
35588
diff
changeset
|
1008 nil) |
29876 | 1009 |
37661
6d7c89c79996
Set the property `eshell-no-numeric-conversions' on the following
John Wiegley <johnw@newartisans.com>
parents:
37655
diff
changeset
|
1010 (put 'eshell/diff 'eshell-no-numeric-conversions t) |
6d7c89c79996
Set the property `eshell-no-numeric-conversions' on the following
John Wiegley <johnw@newartisans.com>
parents:
37655
diff
changeset
|
1011 |
29876 | 1012 (defun eshell/locate (&rest args) |
1013 "Alias \"locate\" to call Emacs `locate' function." | |
1014 (if (or eshell-plain-locate-behavior | |
1015 (not (and (eshell-interactive-output-p) | |
1016 (not eshell-in-pipeline-p) | |
1017 (not eshell-in-subcommand-p))) | |
1018 (and (stringp (car args)) | |
1019 (string-match "^-" (car args)))) | |
1020 (throw 'eshell-replace-command | |
33020 | 1021 (eshell-parse-command "*locate" (eshell-stringify-list |
1022 (eshell-flatten-list args)))) | |
29876 | 1023 (save-selected-window |
1024 (let ((locate-history-list (list (car args)))) | |
1025 (locate-with-filter (car args) (cadr args)))))) | |
1026 | |
37661
6d7c89c79996
Set the property `eshell-no-numeric-conversions' on the following
John Wiegley <johnw@newartisans.com>
parents:
37655
diff
changeset
|
1027 (put 'eshell/locate 'eshell-no-numeric-conversions t) |
6d7c89c79996
Set the property `eshell-no-numeric-conversions' on the following
John Wiegley <johnw@newartisans.com>
parents:
37655
diff
changeset
|
1028 |
29876 | 1029 (defun eshell/occur (&rest args) |
1030 "Alias \"occur\" to call Emacs `occur' function." | |
1031 (let ((inhibit-read-only t)) | |
35588 | 1032 (if (> (length args) 2) |
1033 (error "usage: occur: (REGEXP &optional NLINES)") | |
1034 (apply 'occur args)))) | |
29876 | 1035 |
37661
6d7c89c79996
Set the property `eshell-no-numeric-conversions' on the following
John Wiegley <johnw@newartisans.com>
parents:
37655
diff
changeset
|
1036 (put 'eshell/occur 'eshell-no-numeric-conversions t) |
6d7c89c79996
Set the property `eshell-no-numeric-conversions' on the following
John Wiegley <johnw@newartisans.com>
parents:
37655
diff
changeset
|
1037 |
106286
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1038 ;; Pacify the byte-compiler. |
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1039 (defvar tramp-default-proxies-alist) |
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1040 |
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1041 (defun eshell/su (&rest args) |
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1042 "Alias \"su\" to call Tramp." |
106390 | 1043 (require 'tramp) |
106311
12c2a6b10caf
* eshell/em-unix (eshell/whoami): Make it a defun but a defalias.
Michael Albinus <michael.albinus@gmx.de>
parents:
106286
diff
changeset
|
1044 (setq args (eshell-stringify-list (eshell-flatten-list args))) |
106390 | 1045 (let ((orig-args (copy-tree args))) |
106286
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1046 (eshell-eval-using-options |
106390 | 1047 "su" args |
106286
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1048 '((?h "help" nil nil "show this usage screen") |
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1049 (?l "login" nil login "provide a login environment") |
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1050 (? nil nil login "provide a login environment") |
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1051 :usage "[- | -l | --login] [USER] |
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1052 Become another USER during a login session.") |
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1053 (throw 'eshell-replace-command |
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1054 (let ((user "root") |
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1055 (host (or (file-remote-p default-directory 'host) |
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1056 "localhost")) |
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1057 (dir (or (file-remote-p default-directory 'localname) |
106390 | 1058 (expand-file-name default-directory)))) |
106311
12c2a6b10caf
* eshell/em-unix (eshell/whoami): Make it a defun but a defalias.
Michael Albinus <michael.albinus@gmx.de>
parents:
106286
diff
changeset
|
1059 (eshell-for arg args |
12c2a6b10caf
* eshell/em-unix (eshell/whoami): Make it a defun but a defalias.
Michael Albinus <michael.albinus@gmx.de>
parents:
106286
diff
changeset
|
1060 (if (string-equal arg "-") (setq login t) (setq user arg))) |
106390 | 1061 ;; `eshell-eval-using-options' does not handle "-". |
1062 (if (member "-" orig-args) (setq login t)) | |
106311
12c2a6b10caf
* eshell/em-unix (eshell/whoami): Make it a defun but a defalias.
Michael Albinus <michael.albinus@gmx.de>
parents:
106286
diff
changeset
|
1063 (if login (setq dir "~/")) |
106286
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1064 (if (and (file-remote-p default-directory) |
106390 | 1065 (or |
1066 (not (string-equal | |
1067 "su" (file-remote-p default-directory 'method))) | |
1068 (not (string-equal | |
1069 user (file-remote-p default-directory 'user))))) | |
106286
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1070 (add-to-list |
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1071 'tramp-default-proxies-alist |
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1072 (list host user (file-remote-p default-directory)))) |
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1073 (eshell-parse-command |
106311
12c2a6b10caf
* eshell/em-unix (eshell/whoami): Make it a defun but a defalias.
Michael Albinus <michael.albinus@gmx.de>
parents:
106286
diff
changeset
|
1074 "cd" (list (format "/su:%s@%s:%s" user host dir)))))))) |
106286
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1075 |
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1076 (put 'eshell/su 'eshell-no-numeric-conversions t) |
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1077 |
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1078 (defun eshell/sudo (&rest args) |
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1079 "Alias \"sudo\" to call Tramp." |
106390 | 1080 (require 'tramp) |
106311
12c2a6b10caf
* eshell/em-unix (eshell/whoami): Make it a defun but a defalias.
Michael Albinus <michael.albinus@gmx.de>
parents:
106286
diff
changeset
|
1081 (setq args (eshell-stringify-list (eshell-flatten-list args))) |
106390 | 1082 (let ((orig-args (copy-tree args))) |
106286
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1083 (eshell-eval-using-options |
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1084 "sudo" args |
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1085 '((?h "help" nil nil "show this usage screen") |
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1086 (?u "user" t user "execute a command as another USER") |
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1087 :show-usage |
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1088 :usage "[(-u | --user) USER] COMMAND |
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1089 Execute a COMMAND as the superuser or another USER.") |
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1090 (throw 'eshell-external |
106390 | 1091 (let ((user (or user "root")) |
1092 (host (or (file-remote-p default-directory 'host) | |
1093 "localhost")) | |
1094 (dir (or (file-remote-p default-directory 'localname) | |
1095 (expand-file-name default-directory)))) | |
1096 ;; `eshell-eval-using-options' reads options of COMMAND. | |
1097 (while (and (stringp (car orig-args)) | |
1098 (member (car orig-args) '("-u" "--user"))) | |
1099 (setq orig-args (cddr orig-args))) | |
106286
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1100 (if (and (file-remote-p default-directory) |
106390 | 1101 (or |
1102 (not (string-equal | |
1103 "sudo" (file-remote-p default-directory 'method))) | |
1104 (not (string-equal | |
1105 user (file-remote-p default-directory 'user))))) | |
106286
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1106 (add-to-list |
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1107 'tramp-default-proxies-alist |
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1108 (list host user (file-remote-p default-directory)))) |
106311
12c2a6b10caf
* eshell/em-unix (eshell/whoami): Make it a defun but a defalias.
Michael Albinus <michael.albinus@gmx.de>
parents:
106286
diff
changeset
|
1109 (let ((default-directory (format "/sudo:%s@%s:%s" user host dir))) |
106390 | 1110 (eshell-named-command (car orig-args) (cdr orig-args)))))))) |
106286
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1111 |
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1112 (put 'eshell/sudo 'eshell-no-numeric-conversions t) |
69ba8f3430e1
* eshell/em-unix.el (eshell/su, eshell/sudo): New defuns,
Michael Albinus <michael.albinus@gmx.de>
parents:
106219
diff
changeset
|
1113 |
87076
9b97b187c7e2
Require individual files if needed when compiling, rather than
Glenn Morris <rgm@gnu.org>
parents:
86202
diff
changeset
|
1114 (provide 'em-unix) |
29876 | 1115 |
95152
ad5d26b1d5d1
Use eshell-defgroup rather than defgroup.
Glenn Morris <rgm@gnu.org>
parents:
94661
diff
changeset
|
1116 ;; Local Variables: |
ad5d26b1d5d1
Use eshell-defgroup rather than defgroup.
Glenn Morris <rgm@gnu.org>
parents:
94661
diff
changeset
|
1117 ;; generated-autoload-file: "esh-groups.el" |
ad5d26b1d5d1
Use eshell-defgroup rather than defgroup.
Glenn Morris <rgm@gnu.org>
parents:
94661
diff
changeset
|
1118 ;; End: |
ad5d26b1d5d1
Use eshell-defgroup rather than defgroup.
Glenn Morris <rgm@gnu.org>
parents:
94661
diff
changeset
|
1119 |
29876 | 1120 ;;; em-unix.el ends here |