From 00bc88d11a96ea57c309f2e6ce91f54b72f89602 Mon Sep 17 00:00:00 2001 From: Vitalii Ananev Date: Sun, 19 Dec 2021 22:25:17 +0300 Subject: [PATCH] fix start.sh for macos --- .gitattributes | 1 + src/main/assembly/zip/start.bat | 4 ++-- src/main/assembly/zip/start.sh | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..4e6d0543 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +src/main/assembly/zip/start.sh eol=lf diff --git a/src/main/assembly/zip/start.bat b/src/main/assembly/zip/start.bat index 574ced35..7558b3bf 100644 --- a/src/main/assembly/zip/start.bat +++ b/src/main/assembly/zip/start.bat @@ -17,11 +17,11 @@ # # Задать путь к распакованному архиву с Java -#set JAVA_HOME=C:\Program Files\Java\jdk-16 +#set JAVA_HOME=C:\Program Files\Java\jdk-17 # Запуск приложения chcp 65001 set PATH=%JAVA_HOME%\bin;%PATH% for %%A in (*.jar) do set jarfile=%%A java -jar %jarfile% -pause \ No newline at end of file +pause diff --git a/src/main/assembly/zip/start.sh b/src/main/assembly/zip/start.sh index f9d488a5..b57cef51 100644 --- a/src/main/assembly/zip/start.sh +++ b/src/main/assembly/zip/start.sh @@ -17,7 +17,8 @@ # # Задать путь к распакованному архиву с Java -#export JAVA_HOME=/opt/jdk-16 +#export JAVA_HOME=/opt/jdk-17 [ -n "$JAVA_HOME" ] && export PATH=$JAVA_HOME/bin:$PATH -java -jar *.jar \ No newline at end of file +cd $(dirname $0) +java -jar *.jar