diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2019-02-02 11:53:03 -0800 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2019-02-02 11:53:03 -0800 |
| commit | d16a4171a61cf8af5088a1aca9476aa7a44a2441 (patch) | |
| tree | 4eabc55862ff4194356d1b3597fa3847676369bf /setup | |
| parent | c0b737b3a8b3a5bb2a383e14d3ae5c14a5260781 (diff) | |
| download | trackermap-server-d16a4171a61cf8af5088a1aca9476aa7a44a2441.tar.gz trackermap-server-d16a4171a61cf8af5088a1aca9476aa7a44a2441.tar.bz2 trackermap-server-d16a4171a61cf8af5088a1aca9476aa7a44a2441.zip | |
Update packaging scripts
Diffstat (limited to 'setup')
| -rwxr-xr-x | setup/package.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/setup/package.sh b/setup/package.sh index 09a2c28a9..80c7968b0 100755 --- a/setup/package.sh +++ b/setup/package.sh @@ -65,7 +65,7 @@ fi if [ $PLATFORM = "all" -o $PLATFORM = "windows-64" ]; then check_requirement "Inno Extractor" "which innoextract" "Missing innoextract binary" check_requirement "Inno Setup" "ls innosetup-*.exe" "Missing Inno Setup (http://www.jrsoftware.org/isdl.php)" - check_requirement "Windows 64 Java" "ls java-*.windows.x86_64.zip" "Missing Windows 64 Java (https://github.com/ojdkbuild/ojdkbuild)" + check_requirement "Windows 64 Java" "ls java-*.windows.ojdkbuild.x86_64.zip" "Missing Windows 64 Java (https://github.com/ojdkbuild/ojdkbuild)" check_requirement "Wine" "which wine" "Missing wine binary" fi if [ $PLATFORM = "all" -o $PLATFORM = "linux-64" -o $PLATFORM = "linux-arm" ]; then @@ -128,9 +128,9 @@ package_other () { package_windows () { info "Building Windows 64 installer" - unzip -q -o java-*.windows.x86_64.zip - jlink --module-path java-*.windows.x86_64/jmods --add-modules java.se.ee,jdk.charsets --output out/jre - rm -rf java-*.windows.x86_64 + unzip -q -o java-*.windows.ojdkbuild.x86_64.zip + jlink --module-path java-*.windows.ojdkbuild.x86_64/jmods --add-modules java.se,jdk.charsets --output out/jre + rm -rf java-*.windows.ojdkbuild.x86_64 wine app/ISCC.exe traccar.iss >/dev/null rm -rf out/jre zip -q -j traccar-windows-64-$VERSION.zip Output/traccar-setup.exe README.txt @@ -143,7 +143,7 @@ package_linux () { cp traccar.service out unzip -q -o jdk-*-linux-$1.zip - jlink --module-path jdk-*-linux-$1/jmods --add-modules java.se.ee,jdk.charsets --output out/jre + jlink --module-path jdk-*-linux-$1/jmods --add-modules java.se,jdk.charsets --output out/jre rm -rf jdk-*-linux-$1 makeself --quiet --notemp out traccar.run "traccar" ./setup.sh rm -rf out/jre |