Pick correct binary in newer versions of clojure

railwayapp · Nov 6, 2024 · 28ad1f3 · 28ad1f3
1 parent 1b278d4
commit 28ad1f3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/docs/pages/docs/providers/clojure.md b/docs/pages/docs/providers/clojure.md
@@ -24,7 +24,7 @@ The version can be overridden by
 If a `build.clj` file for [`tools.build`](https://clojure.org/guides/tools_build) is found:
 
 ```
-clojure -T:build uber; if [ -f /app/target/uberjar/*standalone.jar ]; then mv /app/target/uberjar/*standalone.jar /app/target/*standalone.jar; fi
+"clojure -T:build uber; for name in /app/target/default+uberjar/*.jar; do case $name in (*SNAPSHOT*) continue;; esac; mv $name /app/target/standalone.jar; fi"
 ```
 
 If the `lein-ring` plugin is found:

diff --git a/src/providers/clojure.rs b/src/providers/clojure.rs
@@ -43,11 +43,12 @@ impl Provider for ClojureProvider {
         };
 
         // based on project config, uberjar can be created under ./target/uberjar or ./target, This ensure file will be found on the same place whatevery the project config is
-        let move_file_cmd = "if [ -f /app/target/default+uberjar/*standalone.jar ]; then mv /app/target/default+uberjar/*standalone.jar /app/target/*standalone.jar; fi";
+        let move_file_cmd = "for name in /app/target/default+uberjar/*.jar; do case $name in (*SNAPSHOT*) continue;; esac; mv $name /app/target/standalone.jar; fi";
+
         let mut build = Phase::build(Some(format!("{build_cmd}; {move_file_cmd}")));
         build.depends_on_phase("setup");
 
-        let start = StartPhase::new("JAR_FILE=$(find ./target -name \"*standalone.jar\"); bash -c \"java $JAVA_OPTS -jar $JAR_FILE\"");
+        let start = StartPhase::new("JAR_FILE=$(find ./target -name \"standalone.jar\"); bash -c \"java $JAVA_OPTS -jar $JAR_FILE\"");
 
         let plan = BuildPlan::new(&vec![setup, build], Some(start));
         Ok(Some(plan))

diff --git a/tests/snapshots/generate_plan_tests__clojure_tools_build.snap b/tests/snapshots/generate_plan_tests__clojure_tools_build.snap
@@ -16,7 +16,7 @@ expression: plan
         "setup"
       ],
       "cmds": [
-        "clojure -T:build uber; if [ -f /app/target/default+uberjar/*standalone.jar ]; then mv /app/target/default+uberjar/*standalone.jar /app/target/*standalone.jar; fi"
+        "clojure -T:build uber; for name in /app/target/default+uberjar/*.jar; do case $name in (*SNAPSHOT*) continue;; esac; mv $name /app/target/standalone.jar; fi"
       ]
     },
     "setup": {