Skip to content

Commit 92470d7

Browse files
committed
Use the <<< ~{} >>> placeholder syntax instead of { ${} }
1 parent db2c795 commit 92470d7

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

wdlgen/task.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,13 @@ def get_string(self):
110110
if self.optional:
111111
# Ugly optional workaround: https://github.com/openwdl/wdl/issues/25#issuecomment-315424063
112112
internal_pref = f'if defined({name}) then "{bc}" else ""'
113-
return f'${{{internal_pref}}}${{sep=" {bc}" {name}}}'
114-
return f'${{sep=" " prefix("{bc}", {name})}}'
113+
return f'~{{{internal_pref}}}~{{sep=" {bc}" {name}}}'
114+
return f'~{{sep=" " prefix("{bc}", {name})}}'
115115

116116
if array_sep and self.optional:
117117
# optional array with separator
118118
# ifdefname = f'(if defined({name}) then {name} else [])'
119-
return f'${{true="{bc}" false="" defined({name})}}${{sep="{array_sep}" {name}}}'
119+
return f'~{{true="{bc}" false="" defined({name})}}~{{sep="{array_sep}" {name}}}'
120120

121121
options = []
122122
if default:
@@ -137,9 +137,9 @@ def get_string(self):
137137

138138
if self.optional and not default:
139139
prewithquotes = f'"{bc}" + ' if bc.strip() else ''
140-
return f'${{{stroptions}{prewithquotes}{name}}}'
140+
return f'~{{{stroptions}{prewithquotes}{name}}}'
141141
else:
142-
return bc + f"${{{stroptions}{name}}}"
142+
return bc + f"~{{{stroptions}{name}}}"
143143

144144
def __init__(self, command, inputs: Optional[List[CommandInput]]=None, arguments: Optional[List[CommandArgument]]=None):
145145
self.command = command
@@ -199,7 +199,7 @@ def get_string(self):
199199
com = "\n".join(c.get_string(indent=2) for c in self.command)
200200
else:
201201
com = self.command.get_string(indent=2)
202-
command_block = "{tb}command {{\n{args}\n{tb}}}".format(
202+
command_block = "{tb}command <<<\n{args}\n{tb}>>>".format(
203203
tb=tb,
204204
args=com
205205
)

0 commit comments

Comments
 (0)