Changeset 18801 in josm for trunk/native

Timestamp:

2023-08-09T15:30:01+02:00 (19 months ago)

Author:

taylor.smock

Message:

Fix #22832: Code cleanup and some simplification, documentation fixes (patch by gaben)

There should not be any functional changes in this patch; it is intended to do
the following:

• Simplify and cleanup code (example: Arrays.asList(item) -> Collections.singletonList(item))
• Fix typos in documentation (which also corrects the documentation to match what actually happens, in some cases)

Location:

trunk/native

Files:

• docker-test.sh (modified) (1 diff)
• windows/win-jpackage.sh (modified) (3 diffs)

trunk/native/docker-test.sh

@@ +1 @@
+#!/bin/bash
+
 docker build . -t josm/josm
 mkdir -p test/report
-docker run -it --name josm -v `pwd`/test/report:/josm/test/report josm/josm
+docker run -it --name josm -v "$(pwd)"/test/report:/josm/test/report josm/josm
 docker rm josm
 docker rmi josm/josm

trunk/native/windows/win-jpackage.sh

@@ -38 +38 @@
 #sed -i "s|%josm-source-dir%|$(pwd)|g" native/windows/main.wxs
 cp native/windows/main.wxs native/windows/main.wxs.bak
-sed -i 's?%josm-source-dir%?'`pwd`'?' native/windows/main.wxs
+sed -i "s?%josm-source-dir%?$(pwd)?" native/windows/main.wxs
 sed -i 's?"/c/?"c:/?g' native/windows/main.wxs
 sed -i 's?"/d/?"d:/?g' native/windows/main.wxs
@@ -47 +47 @@
 for type in exe msi
 do
-    jpackage $JPACKAGEOPTIONS -n "JOSM" --input dist --main-jar josm-custom.jar \
+    jpackage "$JPACKAGEOPTIONS" -n "JOSM" --input dist --main-jar josm-custom.jar \
     --main-class org.openstreetmap.josm.gui.MainApplication \
     --icon ./native/windows/logo.ico --type $type --dest app \
@@ -86 +86 @@
 mv native/windows/main.wxs.bak native/windows/main.wxs
 
-mv app/JOSM-1.5.$1.exe app/JOSM.exe
-mv app/JOSM-1.5.$1.msi app/JOSM.msi
+mv app/JOSM-1.5."$1".exe app/JOSM.exe
+mv app/JOSM-1.5."$1".msi app/JOSM.msi
 
 # Workaround to https://bugs.openjdk.java.net/browse/JDK-8261845