add seperator option for find-in-jars

oldratlee · oldratlee · commit 24c83786543d · 2018-05-24T10:57:22.000+08:00
diff --git a/docs/java.md b/docs/java.md
@@ -358,14 +358,15 @@ Find file in the jar files under specified directory(recursive, include subdirec
 The pattern default is *extended* regex.
 
 Example:
-    find-in-jars 'log4j\.properties'
-    find-in-jars '^log4j(\.properties|\.xml)$' # search file log4j.properties/log4j.xml at zip root
-    find-in-jars 'log4j\.properties$' -d /path/to/find/directory
-    find-in-jars 'log4j\.properties' -d /path/to/find/dir1 -d /path/to/find/dir2
+  find-in-jars 'log4j\.properties'
+  find-in-jars '^log4j(\.properties|\.xml)$' # search file log4j.properties/log4j.xml at zip root
+  find-in-jars 'log4j\.properties$' -d /path/to/find/directory
+  find-in-jars 'log4j\.properties' -d /path/to/find/dir1 -d /path/to/find/dir2
 
 Options:
   -d, --dir              the directory that find jar files, default is current directory.
                          this option can specify multiply times to find in multiply directories.
+  -s, --seperator        seperator for jar file and file entry, default is `!'.
   -E, --extended-regexp  PATTERN is an extended regular expression (*default*)
   -F, --fixed-strings    PATTERN is a set of newline-separated strings
   -G, --basic-regexp     PATTERN is a basic regular expression
diff --git a/find-in-jars b/find-in-jars
@@ -30,6 +30,7 @@ Example:
 Options:
   -d, --dir              the directory that find jar files, default is current directory.
                          this option can specify multiply times to find in multiply directories.
+  -s, --seperator        seperator for jar file and file entry, default is \`!'.
   -E, --extended-regexp  PATTERN is an extended regular expression (*default*)
   -F, --fixed-strings    PATTERN is a set of newline-separated strings
   -G, --basic-regexp     PATTERN is a basic regular expression
@@ -56,6 +57,10 @@ while [ $# -gt 0 ]; do
         dirs=("${dirs[@]}" "$2")
         shift 2
         ;;
+    -s|--seperator)
+        seperator="$2"
+        shift 2
+        ;;
     -E|--extended-regexp)
         regex_mode=-E
         shift
@@ -100,6 +105,7 @@ while [ $# -gt 0 ]; do
     esac
 done
 dirs=${dirs:-.}
+seperator="${seperator:-!}"
 
 [ "${#args[@]}" -eq 0 ] && { echo "No find file pattern!" 1>&2 ; usage 1; }
 [ "${#args[@]}" -gt 1 ] && { echo "More than 1 file pattern!" 1>&2 ; usage 1; }
@@ -207,8 +213,8 @@ while read jar_file; do
             clearResponsiveMessage
 
             $is_console &&
-                echo "$ec[1;31m${jar_file}$eend$ec[1;32m"\!"$eend${file}" ||
-                echo "${jar_file}"\!"${file}"
+                echo "$ec[1;31m${jar_file}${eend}${ec}[1;32m${seperator}${eend}${file}" ||
+                echo "${jar_file}${seperator}${file}"
         done
 
     clearResponsiveMessage
