diff options
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/default.xml | 2 | ||||
| -rwxr-xr-x | setup/package.sh | 26 | ||||
| -rw-r--r-- | setup/traccar.iss | 2 |
3 files changed, 7 insertions, 23 deletions
diff --git a/setup/default.xml b/setup/default.xml index 95bb1f04b..092b4f494 100644 --- a/setup/default.xml +++ b/setup/default.xml @@ -11,7 +11,7 @@ --> <entry key='web.port'>8082</entry> - <entry key='web.path'>./modern</entry> + <entry key='web.path'>./web</entry> <entry key='web.sanitize'>false</entry> <entry key='web.persistSession'>false</entry> <entry key='web.showUnknownDevices'>true</entry> diff --git a/setup/package.sh b/setup/package.sh index f8ec927eb..5b3c9bcde 100755 --- a/setup/package.sh +++ b/setup/package.sh @@ -15,7 +15,6 @@ usage () { echo "Available platforms:" echo " * linux-64" echo " * linux-arm" - echo " * linux-arm64" echo " * windows-64" echo " * other" exit 1 @@ -65,17 +64,14 @@ if [ $PLATFORM = "all" -o $PLATFORM = "windows-64" ]; then check_requirement "Windows 64 Java" "ls OpenJDK*64_windows*.zip" "Missing Windows 64 JDK (https://adoptium.net/)" check_requirement "Wine" "which wine" "Missing wine binary" fi -if [ $PLATFORM = "all" -o $PLATFORM = "linux-64" -o $PLATFORM = "linux-arm" -o $PLATFORM = "linux-arm64" ]; then +if [ $PLATFORM = "all" -o $PLATFORM = "linux-64" -o $PLATFORM = "linux-arm" ]; then check_requirement "Makeself" "which makeself" "Missing makeself binary" fi if [ $PLATFORM = "all" -o $PLATFORM = "linux-64" ]; then check_requirement "Linux 64 Java" "ls OpenJDK*x64_linux*.tar.gz" "Missing Linux 64 JDK (https://adoptium.net/)" fi if [ $PLATFORM = "all" -o $PLATFORM = "linux-arm" ]; then - check_requirement "Linux ARM Java" "ls OpenJDK*arm_linux*.tar.gz" "Missing Linux ARM JDK (https://adoptium.net/)" -fi -if [ $PLATFORM = "all" -o $PLATFORM = "linux-arm64" ]; then - check_requirement "Linux ARM 64 Java" "ls OpenJDK*aarch64_linux*.tar.gz" "Missing Linux ARM 64 JDK (https://adoptium.net/)" + check_requirement "Linux ARM Java" "ls OpenJDK*aarch64_linux*.tar.gz" "Missing Linux ARM JDK (https://adoptium.net/)" fi if [ $PREREQ = false ]; then info "Missing build requirements, aborting..." @@ -85,14 +81,13 @@ else fi prepare () { - mkdir -p out/{conf,data,lib,logs,legacy,modern,schema,templates} + mkdir -p out/{conf,data,lib,logs,web,schema,templates} cp ../target/tracker-server.jar out cp ../target/lib/* out/lib cp ../schema/* out/schema cp -r ../templates/* out/templates - cp -r ../traccar-web/web/* out/legacy - cp -r ../traccar-web/modern/build/* out/modern + cp -r ../traccar-web/build/* out/web cp default.xml out/conf cp traccar.xml out/conf @@ -158,23 +153,16 @@ package_linux_64 () { package_linux_arm () { info "Building Linux ARM installer" - package_linux arm arm + package_linux arm aarch64 ok "Created Linux ARM installer" } -package_linux_arm64 () { - info "Building Linux ARM 64 installer" - package_linux arm64 aarch64 - ok "Created Linux ARM 64 installer" -} - prepare case $PLATFORM in all) package_linux_64 package_linux_arm - package_linux_arm64 package_windows package_other ;; @@ -187,10 +175,6 @@ case $PLATFORM in package_linux_arm ;; - linux-arm64) - package_linux_arm64 - ;; - windows-64) package_windows ;; diff --git a/setup/traccar.iss b/setup/traccar.iss index 2ccee1c3e..466a40c30 100644 --- a/setup/traccar.iss +++ b/setup/traccar.iss @@ -1,6 +1,6 @@ [Setup] AppName=Traccar -AppVersion=5.12 +AppVersion=6.0 DefaultDirName={pf}\Traccar OutputBaseFilename=traccar-setup ArchitecturesInstallIn64BitMode=x64 |