gyzz/openerp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!100 指定Bash解释器，避免因解释器不同出现不支持的函数语法错误

Browse Source 
Merge pull request !100 from 吴俊城/master
This commit is contained in:
季圣华 2025-03-03 13:15:52 +00:00 committed by Gitee
commit 20ef00adea
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jshERP-boot/.gitattributes vendored
View File

@ -1,3 +1,4 @@
*.js linguist-language=Java *.js linguist-language=Java
*.css linguist-language=Java *.css linguist-language=Java
*.html linguist-language=Java *.html linguist-language=Java
*.sh text eol=lf

5
jshERP-boot/src/main/assembly/assembly.xml
View File

@ -3,8 +3,7 @@
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 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/xsd/assembly-1.1.0.xsd ">
http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 ">
<id>bin</id> <id>bin</id>
@ -38,7 +37,7 @@ http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 ">
<includes> <includes>
<include>run-manage.sh</include> <include>run-manage.sh</include>
</includes> </includes>
<lineEnding>unix</lineEnding> <lineEnding>lf</lineEnding>
</fileSet> </fileSet>
<fileSet> <fileSet>
<directory>${project.basedir}/src/main/bin/</directory> <directory>${project.basedir}/src/main/bin/</directory>

2
jshERP-boot/src/main/bin/run-manage.sh
View File

@ -1,3 +1,5 @@
#!/bin/bash
SERVER_NAME=jshERP SERVER_NAME=jshERP
readonly APP_HOME=${FILE_PATH:-$(dirname $(cd `dirname $0`; pwd))} readonly APP_HOME=${FILE_PATH:-$(dirname $(cd `dirname $0`; pwd))}
#readonly JAVA_HOME="" #readonly JAVA_HOME=""