Support windows newlines in modules file

EngineHub · Apr 12, 2019 · 9dfbabf · 9dfbabf
1 parent e304652
commit 9dfbabf
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/main/resources/interpreter-helpers/bash.sh b/src/main/resources/interpreter-helpers/bash.sh
@@ -47,6 +47,8 @@ if [[ "$(jdk_version)" -gt "8" ]]; then
 	# Read the required modules from the jar itself, so that each jar can have different dependencies, without requiring
 	# a re-install.
 	MODULES=$(unzip -p "%%LOCATION%%" interpreter-helpers/modules)
+	# Ensure that the modules file will work even if it has windows line endings
+	MODULES=$(echo "$MODULES" | sed 's/\r$//g')
 	MPATH=$(echo "$MODULES" | sed 's/\(.*\)/--add-opens \1=ALL-UNNAMED/' | tr '\n' ' ')
 else
 	MPATH=""