try again

babashka · May 5, 2024 · f22462f · f22462f
1 parent cf94327
commit f22462f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/bbin b/bbin
@@ -299,7 +299,7 @@ WARNING: (We won't make any changes without asking you first.)
 
 (defn- local-script-path? [x]
   (boolean (and (string? x) (or (fs/exists? x)
-                                (fs/exists? (str/replace x #"^file://" ""))))))
+                                (fs/exists? (str/replace x #"^file:(//|\\\\)" ""))))))
 
 (defn- http-url? [x]
   (boolean (and (string? x) (re-seq #"^https?://" x))))
@@ -378,7 +378,7 @@ WARNING: (We won't make any changes without asking you first.)
 
     (or (and (#{:local} procurer) (and (:script/lib cli-opts)
                                        (or (fs/regular-file? (:script/lib cli-opts))
-                                           (fs/regular-file? (str/replace (:script/lib cli-opts) #"^file://" "")))))
+                                           (fs/regular-file? (str/replace (:script/lib cli-opts) #"^file:(//|\\\\)" "")))))
         (and (#{:http} procurer) (re-seq #"\.(cljc?|bb)$" (:script/lib cli-opts))))
     :file
 
@@ -1392,7 +1392,7 @@ WARNING: (We won't make any changes without asking you first.)
 
   (upgrade [_]
     (let [cli-opts' (merge (select-keys cli-opts [:edn])
-                           {:script/lib (str/replace (:bbin/url coords) #"^file://" "")})]
+                           {:script/lib (str/replace (:bbin/url coords) #"^file:(//|\\\\)" "")})]
       (p/install (map->LocalFile {:cli-opts cli-opts'
                                   :coords coords}))))
 
@@ -1457,7 +1457,7 @@ WARNING: (We won't make any changes without asking you first.)
 
   (upgrade [_]
     (let [cli-opts' (merge (select-keys cli-opts [:edn])
-                           {:script/lib (str/replace (:bbin/url coords) #"^file://" "")})]
+                           {:script/lib (str/replace (:bbin/url coords) #"^file:(//|\\\\)" "")})]
       (p/install (map->LocalJar {:cli-opts cli-opts'
                                  :coords coords}))))
 

diff --git a/src/babashka/bbin/deps.clj b/src/babashka/bbin/deps.clj
@@ -104,7 +104,7 @@
 
 (defn- local-script-path? [x]
   (boolean (and (string? x) (or (fs/exists? x)
-                                (fs/exists? (str/replace x #"^file:(//|\\)" ""))))))
+                                (fs/exists? (str/replace x #"^file:(//|\\\\)" ""))))))
 
 (defn- http-url? [x]
   (boolean (and (string? x) (re-seq #"^https?://" x))))
@@ -183,7 +183,7 @@
 
     (or (and (#{:local} procurer) (and (:script/lib cli-opts)
                                        (or (fs/regular-file? (:script/lib cli-opts))
-                                           (fs/regular-file? (str/replace (:script/lib cli-opts) #"^file:(//|\\)" "")))))
+                                           (fs/regular-file? (str/replace (:script/lib cli-opts) #"^file:(//|\\\\)" "")))))
         (and (#{:http} procurer) (re-seq #"\.(cljc?|bb)$" (:script/lib cli-opts))))
     :file
 

diff --git a/src/babashka/bbin/scripts/local_file.clj b/src/babashka/bbin/scripts/local_file.clj
@@ -20,7 +20,7 @@
 
   (upgrade [_]
     (let [cli-opts' (merge (select-keys cli-opts [:edn])
-                           {:script/lib (str/replace (:bbin/url coords) #"^file:(//|\\)" "")})]
+                           {:script/lib (str/replace (:bbin/url coords) #"^file:(//|\\\\)" "")})]
       (p/install (map->LocalFile {:cli-opts cli-opts'
                                   :coords coords}))))
 

diff --git a/src/babashka/bbin/scripts/local_jar.clj b/src/babashka/bbin/scripts/local_jar.clj
@@ -56,7 +56,7 @@
 
   (upgrade [_]
     (let [cli-opts' (merge (select-keys cli-opts [:edn])
-                           {:script/lib (str/replace (:bbin/url coords) #"^file:(//|\\)" "")})]
+                           {:script/lib (str/replace (:bbin/url coords) #"^file:(//|\\\\)" "")})]
       (p/install (map->LocalJar {:cli-opts cli-opts'
                                  :coords coords}))))