Merge pull request #412 from bootleq/cli-M-opt

Avoid add M exec-opt twice
liquidz · May 27, 2022 · b3c8078 · b3c8078
2 parents ed226c7 + e5fedaa
commit b3c8078
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/bin/iced b/bin/iced
@@ -1,5 +1,9 @@
 #!/usr/bin/env bash
 
+# === WARNING ===
+# bin/iced is generated by `make bin`.
+# Please edit clj/template/iced.bash instead of bin/iced.
+
 CWD=$(pwd)
 SCRIPT_DIR=$(cd $(dirname $0); pwd)
 PROJECT_DIR=$(cd $SCRIPT_DIR; cd ..; pwd)
@@ -402,7 +406,11 @@ case "$1" in
             CLOJURE_CLI_VERSION=$(clojure -Sdescribe | head -1 |  cut -d' ' -f2 | tr -d '"')
             MIN_MAIN_VERSION="1.10.1.672"
             if [ "$(printf '%s\n' "$MIN_MAIN_VERSION" "$CLOJURE_CLI_VERSION" | sort -V | head -n1)" = "$MIN_MAIN_VERSION" ]; then
-                MAIN_FLAG="-M -m"
+                if [[ "$OPTIONS" =~ "-M:" ]]; then
+                    MAIN_FLAG="-m"
+                else
+                    MAIN_FLAG="-M -m"
+                fi
             else
                 MAIN_FLAG="-m"
             fi

diff --git a/clj/template/iced.bash b/clj/template/iced.bash
@@ -1,5 +1,9 @@
 #!/usr/bin/env bash
 
+# === WARNING ===
+# bin/iced is generated by `make bin`.
+# Please edit clj/template/iced.bash instead of bin/iced.
+
 CWD=$(pwd)
 SCRIPT_DIR=$(cd $(dirname $0); pwd)
 PROJECT_DIR=$(cd $SCRIPT_DIR; cd ..; pwd)
@@ -402,7 +406,11 @@ case "$1" in
             CLOJURE_CLI_VERSION=$(clojure -Sdescribe | head -1 |  cut -d' ' -f2 | tr -d '"')
             MIN_MAIN_VERSION="1.10.1.672"
             if [ "$(printf '%s\n' "$MIN_MAIN_VERSION" "$CLOJURE_CLI_VERSION" | sort -V | head -n1)" = "$MIN_MAIN_VERSION" ]; then
-                MAIN_FLAG="-M -m"
+                if [[ "$OPTIONS" =~ "-M:" ]]; then
+                    MAIN_FLAG="-m"
+                else
+                    MAIN_FLAG="-M -m"
+                fi
             else
                 MAIN_FLAG="-m"
             fi