diff --git a/jshERP-boot/.gitattributes b/jshERP-boot/.gitattributes index fe566d71e..7c7f32654 100644 --- a/jshERP-boot/.gitattributes +++ b/jshERP-boot/.gitattributes @@ -1,3 +1,4 @@ *.js linguist-language=Java *.css linguist-language=Java -*.html linguist-language=Java \ No newline at end of file +*.html linguist-language=Java +*.sh text eol=lf \ No newline at end of file diff --git a/jshERP-boot/src/main/assembly/assembly.xml b/jshERP-boot/src/main/assembly/assembly.xml index 4b3818dbf..298a4fa7d 100644 --- a/jshERP-boot/src/main/assembly/assembly.xml +++ b/jshERP-boot/src/main/assembly/assembly.xml @@ -3,8 +3,7 @@ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 - http://maven.apache.org/xsd/assembly-1.1.0.xsd -http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 "> + http://maven.apache.org/xsd/assembly-1.1.0.xsd "> bin @@ -38,7 +37,7 @@ http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 "> run-manage.sh - unix + lf ${project.basedir}/src/main/bin/ diff --git a/jshERP-boot/src/main/bin/run-manage.sh b/jshERP-boot/src/main/bin/run-manage.sh index 45d493de0..a349a383a 100644 --- a/jshERP-boot/src/main/bin/run-manage.sh +++ b/jshERP-boot/src/main/bin/run-manage.sh @@ -1,3 +1,5 @@ +#!/bin/bash + SERVER_NAME=jshERP readonly APP_HOME=${FILE_PATH:-$(dirname $(cd `dirname $0`; pwd))} #readonly JAVA_HOME=""