Skip to content

Commit 72cab2f

Browse files
committed
Try to appease windows (shell-quoting)
1 parent c663ee9 commit 72cab2f

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

cider.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ without interfering with classloaders."
420420
(let* ((script-names (map-values cider--enrich-classpath-script-names))
421421
(temp-prefix cider--temp-name-prefix)
422422
(any-name (rx-to-string
423-
`(or (: (or bos "/") (or ,@script-names) (or eos space))
423+
`(or (: (or bos "/" "\\") (or ,@script-names) (or eos space))
424424
(: ,temp-prefix (or ,@script-names))))))
425425
(string-match any-name cmd)))
426426

test/cider-tests.el

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,17 +115,17 @@
115115
:to-equal nil)))
116116
(describe "for different path + script-name combinations"
117117
:var* ((paths `("/simple/path/"
118-
,(shell-quote-argument "/tmp/path/ with spaces/")
119-
,(shell-quote-argument "/ssh:!slightly@cra --zy!path #enrich me/")))
118+
,"/tmp/path/ with spaces/"
119+
,"/ssh:!slightly@cra --zy!path #enrich me/"))
120120
(simple-names (map-values cider--enrich-classpath-script-names))
121121
(tmp-names (mapcar (lambda (s) (cider--make-temp-name s)) simple-names))
122122
(all-names (seq-concatenate 'list simple-names tmp-names)))
123123
(cl-loop
124124
for path in paths do
125125
(cl-loop
126126
for name in all-names do
127-
(describe (format "cider--enriched-cmd-p with script: %s" (concat path name))
128-
:var ((script (concat path name)))
127+
(describe (format "cider--enriched-cmd-p with script: %s" (shell-quote-argument (concat path name)))
128+
:var ((script (shell-quote-argument (concat path name))))
129129
(it "is true in basic cases "
130130
(expect (cider--enriched-cmd-p (concat "bash " script " /usr/bin/lein"))
131131
:to-be-truthy)

0 commit comments

Comments
 (0)