Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed a bug on Windows

* The build script is now written in binary mode to suppress EOL <-> CRLF conversion on Windows.
* A newline at the end of standalone.conf was missing.
  • Loading branch information...
commit b21fc21dee8e3133738abb2b8075b305f7397834 1 parent f16830a
AncientLeGrey authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 java_to_ruby.rb
4 java_to_ruby.rb
View
@@ -43,7 +43,7 @@
end
# Add TorqueBox bits to .openshift/action_hooks/build
-File.open(File.join(root, '.openshift', 'action_hooks', 'build'), 'w') do |file|
+File.open(File.join(root, '.openshift', 'action_hooks', 'build'), 'wb') do |file|
file.write(<<-END_OF_BUILD)
#!/bin/bash
# This is a simple build script, place your post-deploy but pre-start commands
@@ -86,7 +86,7 @@
# Copy the symlinked file to a new file
mv ${OPENSHIFT_APP_DIR}${OPENSHIFT_APP_TYPE}/bin/standalone.conf ${OPENSHIFT_APP_DIR}${OPENSHIFT_APP_TYPE}/bin/standalone.conf.original
cp ${OPENSHIFT_APP_DIR}${OPENSHIFT_APP_TYPE}/bin/standalone.conf.original ${OPENSHIFT_APP_DIR}${OPENSHIFT_APP_TYPE}/bin/standalone.conf
- echo "JAVA_OPTS=\\"\\$JAVA_OPTS -Djruby.home=${OPENSHIFT_DATA_DIR}jruby\\"" >> ${OPENSHIFT_APP_DIR}${OPENSHIFT_APP_TYPE}/bin/standalone.conf
+ echo -e "\\nJAVA_OPTS=\\"\\$JAVA_OPTS -Djruby.home=${OPENSHIFT_DATA_DIR}jruby\\"" >> ${OPENSHIFT_APP_DIR}${OPENSHIFT_APP_TYPE}/bin/standalone.conf
else
echo "jruby.home has already been set."
fi
Please sign in to comment.
Something went wrong with that request. Please try again.