Skip to content

Commit f4c3306

Browse files
committed
salsa fixes (incorrect compile command)
1 parent f3e27a9 commit f4c3306

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

dockerfiles/salsa/1.1.6/Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,12 @@ ENV SALSA_COMPILER_JAR=/usr/local/lib/salsa/salsa1.1.6.jar
1919
ENV SALSAOPTS=""
2020

2121
# Write aliases to a separate file
22-
RUN echo "alias salsac='java -cp $SALSA_COMPILER_JAR:. salsac.SalsaCompiler !*.salsa; javac -classpath $SALSA_COMPILER_JAR:. !*.java'" >> /usr/src/app/salsa_aliases.sh && \
22+
RUN echo "alias salsac='java -cp $SALSA_COMPILER_JAR:. salsac.SalsaCompiler *.salsa; javac -classpath $SALSA_COMPILER_JAR:. *.java'" >> /usr/src/app/salsa_aliases.sh && \
2323
echo "alias salsa='java -cp $SALSA_COMPILER_JAR:. $SALSAOPTS'" >> /usr/src/app/salsa_aliases.sh && \
2424
echo "alias wwcns='java -cp $SALSA_COMPILER_JAR:. wwc.naming.WWCNamingServer'" >> /usr/src/app/salsa_aliases.sh && \
2525
echo "alias wwctheater='java -cp $SALSA_COMPILER_JAR:. $SALSAOPTS wwc.messaging.Theater'" >> /usr/src/app/salsa_aliases.sh
2626

2727
# make sure the aliases script gets sourced on container start
2828
RUN echo "source /usr/src/app/salsa_aliases.sh" >> /etc/bash.bashrc
2929

30-
# Start the container in bash
3130
CMD ["bash"]

0 commit comments

Comments
 (0)