From 8183c2b1300c036bf28da5c8c9d1bceae3f5383f Mon Sep 17 00:00:00 2001 From: adrech <33599806+adrech@users.noreply.github.com> Date: Thu, 16 Nov 2023 20:10:40 +0100 Subject: [PATCH] Try to appease windows (shell-quoting) --- cider.el | 2 +- test/cider-tests.el | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cider.el b/cider.el index 75015f83d..9ba73078c 100644 --- a/cider.el +++ b/cider.el @@ -420,7 +420,7 @@ without interfering with classloaders." (let* ((script-names (map-values cider--enrich-classpath-script-names)) (temp-prefix cider--temp-name-prefix) (any-name (rx-to-string - `(or (: (or bos "/") (or ,@script-names) (or eos space)) + `(or (: (or ,@script-names) (or eos space)) (: ,temp-prefix (or ,@script-names)))))) (string-match any-name cmd))) diff --git a/test/cider-tests.el b/test/cider-tests.el index 1cef328dd..2894fe5b2 100644 --- a/test/cider-tests.el +++ b/test/cider-tests.el @@ -115,8 +115,8 @@ :to-equal nil))) (describe "for different path + script-name combinations" :var* ((paths `("/simple/path/" - ,(shell-quote-argument "/tmp/path/ with spaces/") - ,(shell-quote-argument "/ssh:!slightly@cra --zy!path #enrich me/"))) + ,"/tmp/path/ with spaces/" + ,"/ssh:!slightly@cra --zy!path #enrich me/")) (simple-names (map-values cider--enrich-classpath-script-names)) (tmp-names (mapcar (lambda (s) (cider--make-temp-name s)) simple-names)) (all-names (seq-concatenate 'list simple-names tmp-names))) @@ -124,8 +124,8 @@ for path in paths do (cl-loop for name in all-names do - (describe (format "cider--enriched-cmd-p with script: %s" (concat path name)) - :var ((script (concat path name))) + (describe (format "cider--enriched-cmd-p with script: %s" (shell-quote-argument (concat path name))) + :var ((script (shell-quote-argument (concat path name)))) (it "is true in basic cases " (expect (cider--enriched-cmd-p (concat "bash " script " /usr/bin/lein")) :to-be-truthy)