Skip to content

Commit

Permalink
Standardize command substitution syntax.
Browse files Browse the repository at this point in the history
  • Loading branch information
reid-wagner committed Jul 9, 2024
1 parent fd36cd4 commit 5732dfa
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions tools/fragpipe/fragpipe.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
--workflow fp.workflow --manifest fp.manifest
--workdir outputs
--config-msfragger \${CONDA_PREFIX}/share/msfragger-*/MSFragger-*/MSFragger-*.jar
--config-philosopher `which philosopher`
--config-python `which python`
--config-philosopher \$(which philosopher)
--config-python \$(which python)
--config-ionquant \${CONDA_PREFIX}/share/ionquant-*/IonQuant.jar &&
@PREPARE_OUTPUTS@
Expand Down
6 changes: 3 additions & 3 deletions tools/fragpipe/macros.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
Annotation files are copied into the scan directory for TMT workflows.
-->
<token name="@LINK_SAMPLES@"><![CDATA[
CWD=`pwd | sed 's/\//\\\\\//g'` &&
CWD=\$(pwd | sed 's/\//\\\//g') &&
mkdir -p scans &&
#if $wf.workflow_name == "TMT10" or $wf.workflow_name == "TMT11"
Expand Down Expand Up @@ -110,12 +110,12 @@
## For example, the entries sample1/psm.tsv and sample2/psm.tsv would be combined to concat_psm.tsv, a single psm.tsv header as its first line.
for f in psm.tsv ion.tsv peptide.tsv protein.tsv; do
n=0;
for i in `find * -name \${f}`; do
for i in \$(find * -name \${f}); do
d=\${i%/*};
if [[ \$n == 0 ]]; then
awk 'NR==1{printf("Experiment\t%s\n",\$0);}' \$i > concat_\${f};
fi;
awk 'NR>1{printf("'"\${d}"'\t%s\n",\$0);}' \$i >> concat_\${f}; t=`echo \${i} | tr '/' '.'`;
awk 'NR>1{printf("'"\${d}"'\t%s\n",\$0);}' \$i >> concat_\${f}; t=\$(echo \${i} | tr '/' '.');
mv \${i} \${t}; n=\$((n+1));
done;
done
Expand Down

0 comments on commit 5732dfa

Please sign in to comment.