caoychn
diff --git a/‎README.md‎
Lines changed: 2 additions & 2 deletions b/‎README.md‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎run_cpd.sh‎
Lines changed: 14 additions & 13 deletions b/‎run_cpd.sh‎
Lines changed: 14 additions & 13 deletions
diff --git a/‎run_pmd.sh‎
Lines changed: 12 additions & 16 deletions b/‎run_pmd.sh‎
Lines changed: 12 additions & 16 deletions
@@ -49,7 +49,7 @@ To specify a custom ruleset, simply pass the argument to the hook:
 
 ```yaml
     - id: pmd
-      args: ["-R", "my_ruleset.xml"]
+      args: ["-R=my_ruleset.xml"]
 ```
 
 Furthermore, the default language version passed to PMD is `java-17`, which can be tweaked using the `--use-version` argument.
@@ -64,7 +64,7 @@ To change it, simply pass the argument to the hook:
 
 ```yaml
     - id: cpd
-      args: ["--minimum-tokens", "50"]
+      args: ["--minimum-tokens=50"]
 ```
 
 Other [CLI](https://pmd.github.io/latest/pmd_userdocs_cpd.html#cli-usage) arguments are also supported.
 
@@ -1,24 +1,25 @@
 #!/bin/bash
 
-# find the index of the first parameter with a Java file path
-idx=1
+# extract parameters and files
+cpd_args=""
+rm -f /tmp/list
 for (( i=1; i <= "$#"; i++ )); do
-    if [[ ${!i} == *.java ]]; then
-        idx=${i}
-        break
+    if [[ ${!i} =~ --?[^=]+=.* || ${!i} =~ --?[^=]+ ]]; then
+      cpd_args="$cpd_args ${!i}"
+    else
+      echo "${!i}" >> /tmp/list
     fi
 done
 
 # add default minimum tokens if not specified
-cpd_args="${*:1:idx-1}"
-if [[ ! $cpd_args == *"--minimum-tokens "* ]]; then
-  cpd_args="$cpd_args --minimum-tokens 100"
+if [[ ! $cpd_args == *"--minimum-tokens="* ]]; then
+  cpd_args="$cpd_args --minimum-tokens=100"
 fi
 
-# populate list of files to analise
-files="${*:idx}"
-eol=$'\n'
-echo "${files// /$eol}" > /tmp/list
+# add default language if not specified
+if [[ ! $cpd_args == *"--language="* && ! $cpd_args == *"-l="* ]]; then
+  cpd_args="$cpd_args --language=java"
+fi
 
 # shellcheck disable=SC2086
-/opt/pmd/bin/pmd cpd --format text --language java $cpd_args --file-list /tmp/list
+/opt/pmd/bin/pmd cpd --format=text $cpd_args --file-list=/tmp/list
@@ -1,29 +1,25 @@
 #!/bin/bash
 
-# find the index of the first parameter with a Java file path
-idx=1
+# extract parameters and files
+pc_args=""
+rm -f /tmp/list
 for (( i=1; i <= "$#"; i++ )); do
-    if [[ ${!i} == *.java ]]; then
-        idx=${i}
-        break
+    if [[ ${!i} =~ --?[^=]+=.* || ${!i} =~ --?[^=]+ ]]; then
+      pc_args="$pc_args ${!i}"
+    else
+      echo "${!i}" >> /tmp/list
     fi
 done
 
 # add default version if not specified
-pc_args="${*:1:idx-1}"
-if [[ ! $pc_args == *"--use-version "* ]]; then
-  pc_args="$pc_args --use-version java-17"
+if [[ ! $pc_args == *"--use-version="* ]]; then
+  pc_args="$pc_args --use-version=java-17"
 fi
 
 # add default ruleset if not specified
-if [[ ! $pc_args == *"-R "* ]]; then
-  pc_args="$pc_args -R /opt/ruleset.xml"
+if [[ ! $pc_args == *"-R="* && ! $pc_args == *"--rulesets="* ]]; then
+  pc_args="$pc_args -R=/opt/ruleset.xml"
 fi
 
-# populate list of files to analise
-files="${*:idx}"
-eol=$'\n'
-echo "${files// /$eol}" > /tmp/list
-
 # shellcheck disable=SC2086
-/opt/pmd/bin/pmd check --no-progress -f textcolor --file-list /tmp/list $pc_args
+/opt/pmd/bin/pmd check --no-progress -f=textcolor --file-list=/tmp/list $pc_args