Skip to content

Commit d332705

Browse files
committed
fix dotd libs
1 parent ac9076c commit d332705

File tree

1 file changed

+26
-31
lines changed

1 file changed

+26
-31
lines changed

dist/bin/dotd

Lines changed: 26 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -30,55 +30,50 @@ fi
3030
source "$PROG_HOME/bin/common"
3131

3232
# Set dotty-doc dep:
33-
DOTTY_DOC_LIB=$(find_lib *dotty-doc*)
33+
DOTTY_DOC_LIB=$(find_lib "*dotty-doc*")
3434

3535
# Set flexmark deps:
3636
FLEXMARK_LIBS=""
37-
FLEXMARK_LIBS+=$(find_lib *flexmark-0*)$PSEP
38-
FLEXMARK_LIBS+=$(find_lib *flexmark-ext-anchorlink*)$PSEP
39-
FLEXMARK_LIBS+=$(find_lib *flexmark-ext-autolink*)$PSEP
40-
FLEXMARK_LIBS+=$(find_lib *flexmark-ext-emoji*)$PSEP
41-
FLEXMARK_LIBS+=$(find_lib *flexmark-ext-strikethrough*)$PSEP
42-
FLEXMARK_LIBS+=$(find_lib *flexmark-ext-gfm-tables*)$PSEP
43-
FLEXMARK_LIBS+=$(find_lib *flexmark-ext-gfm-tasklist*)$PSEP
44-
FLEXMARK_LIBS+=$(find_lib *flexmark-ext-ins*)$PSEP
45-
FLEXMARK_LIBS+=$(find_lib *flexmark-ext-superscript*)$PSEP
46-
FLEXMARK_LIBS+=$(find_lib *flexmark-ext-tables*)$PSEP
47-
FLEXMARK_LIBS+=$(find_lib *flexmark-ext-wikilink*)$PSEP
48-
FLEXMARK_LIBS+=$(find_lib *flexmark-ext-yaml-front-matter*)$PSEP
49-
FLEXMARK_LIBS+=$(find_lib *flexmark-jira-converter*)$PSEP
50-
FLEXMARK_LIBS+=$(find_lib *flexmark-util*)
37+
FLEXMARK_LIBS+=$(find_lib "*flexmark-0*")$PSEP
38+
FLEXMARK_LIBS+=$(find_lib "*flexmark-ext-anchorlink*")$PSEP
39+
FLEXMARK_LIBS+=$(find_lib "*flexmark-ext-autolink*")$PSEP
40+
FLEXMARK_LIBS+=$(find_lib "*flexmark-ext-emoji*")$PSEP
41+
FLEXMARK_LIBS+=$(find_lib "*flexmark-ext-gfm-strikethrough*")$PSEP
42+
FLEXMARK_LIBS+=$(find_lib "*flexmark-ext-gfm-tables*")$PSEP
43+
FLEXMARK_LIBS+=$(find_lib "*flexmark-ext-gfm-tasklist*")$PSEP
44+
FLEXMARK_LIBS+=$(find_lib "*flexmark-ext-ins*")$PSEP
45+
FLEXMARK_LIBS+=$(find_lib "*flexmark-ext-superscript*")$PSEP
46+
FLEXMARK_LIBS+=$(find_lib "*flexmark-ext-tables*")$PSEP
47+
FLEXMARK_LIBS+=$(find_lib "*flexmark-ext-wikilink*")$PSEP
48+
FLEXMARK_LIBS+=$(find_lib "*flexmark-ext-yaml-front-matter*")$PSEP
49+
FLEXMARK_LIBS+=$(find_lib "*flexmark-jira-converter*")$PSEP
50+
FLEXMARK_LIBS+=$(find_lib "*flexmark-util*")
5151

5252
# Set jackson deps:
5353
JACKSON_LIBS=""
54-
JACKSON_LIBS+=$(find_lib *jackson-annotations*)$PSEP
55-
JACKSON_LIBS+=$(find_lib *jackson-core*)$PSEP
56-
JACKSON_LIBS+=$(find_lib *jackson-databind*)$PSEP
57-
JACKSON_LIBS+=$(find_lib *jackson-dataformat-yaml*)
58-
59-
[[ $filename =~ /jackson.*.jar ]] && \
60-
[[ -z "$JACKSON_LIBS" ]] && JACKSON_LIBS=$filename
61-
[[ $filename =~ /jackson.*.jar ]] && \
62-
[[ ! -z "$JACKSON_LIBS" ]] && JACKSON_LIBS="$JACKSON_LIBS:$filename"
54+
JACKSON_LIBS+=$(find_lib "*jackson-annotations*")$PSEP
55+
JACKSON_LIBS+=$(find_lib "*jackson-core*")$PSEP
56+
JACKSON_LIBS+=$(find_lib "*jackson-databind*")$PSEP
57+
JACKSON_LIBS+=$(find_lib "*jackson-dataformat-yaml*")
6358

6459
# Set liqp dep:
65-
LIQP_LIB=$(find_lib *liqp*)
60+
LIQP_LIB=$(find_lib "*liqp*")
6661

6762
# Set ANTLR dep:
68-
ANTLR_LIB=$(find_lib *antlr-3*)
69-
ANTLR_RUNTIME_LIB=$(find_lib *antlr-runtime-3*)
63+
ANTLR_LIB=$(find_lib "*antlr-3*")
64+
ANTLR_RUNTIME_LIB=$(find_lib "*antlr-runtime-3*")
7065

7166
# Set autolink dep:
72-
AUTOLINK_LIB=$(find_lib *autolink*)
67+
AUTOLINK_LIB=$(find_lib "*autolink-0.6*") # conflict with flexmark-ext-autolink-0.11
7368

7469
# Set snakeyaml dep:
75-
SNAKEYAML_LIB=$(find_lib *snakeyaml*)
70+
SNAKEYAML_LIB=$(find_lib "*snakeyaml*")
7671

7772
# Set ST4 dep:
78-
ST4_LIB=$(find_lib *ST4*)
73+
ST4_LIB=$(find_lib "*ST4*")
7974

8075
# Set jsoup dep:
81-
JSOUP_LIB=$(find_lib *jsoup*)
76+
JSOUP_LIB=$(find_lib "*jsoup*")
8277

8378
CLASS_PATH="$DOTTY_LIB$PSEP$DOTTY_COMP$PSEP$DOTTY_DOC_LIB$PSEP$DOTTY_INTF$PSEP$SBT_INTF"
8479
CLASS_PATH="$CLASS_PATH$PSEP$SCALA_LIB"

0 commit comments

Comments
 (0)