diff --git a/metadata/Radar-v5.5.0-beta4-darwin-wx32-10.xml b/metadata/Radar-v5.5.3-beta-darwin-wx32-10.xml
similarity index 76%
rename from metadata/Radar-v5.5.0-beta4-darwin-wx32-10.xml
rename to metadata/Radar-v5.5.3-beta-darwin-wx32-10.xml
index e047bf7638..6be41e3fbc 100644
--- a/metadata/Radar-v5.5.0-beta4-darwin-wx32-10.xml
+++ b/metadata/Radar-v5.5.3-beta-darwin-wx32-10.xml
@@ -1,8 +1,8 @@
-
+
Radar
- v5.5.0-beta4
+ v5.5.3-beta
Overlays the radar picture on OpenCPN
@@ -29,6 +29,6 @@ such as dual radar range and Doppler.
darwin-wx32
10
x86_64
- https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.0-beta4-darwin-wx32-10-tarball/versions/v5.5.0-beta4/Radar-v5.5.0-beta4_darwin-wx32-10-x86_64.tar.gz
- b04a5363d5a5cee6333c91f03db7f21263eb5e0d7c4cd7d0447087401be2b088
+ https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.3-beta-darwin-wx32-10-tarball/versions/v5.5.3-beta/Radar-v5.5.3-beta_darwin-wx32-10-x86_64.tar.gz
+ 7d8c6aee80b43ba8a9997fea344d8038cdc2baf641b7e6a82d9e2027a98125f8
diff --git a/metadata/Radar-v5.5.0-beta4-debian-11.xml b/metadata/Radar-v5.5.3-beta-debian-11.xml
similarity index 76%
rename from metadata/Radar-v5.5.0-beta4-debian-11.xml
rename to metadata/Radar-v5.5.3-beta-debian-11.xml
index e371cc2d8f..6ca311a77c 100644
--- a/metadata/Radar-v5.5.0-beta4-debian-11.xml
+++ b/metadata/Radar-v5.5.3-beta-debian-11.xml
@@ -1,8 +1,8 @@
-
+
Radar
- v5.5.0-beta4
+ v5.5.3-beta
Overlays the radar picture on OpenCPN
@@ -29,6 +29,6 @@ such as dual radar range and Doppler.
debian-x86_64
11
x86_64
- https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.0-beta4-debian-11-tarball/versions/v5.5.0-beta4/Radar-v5.5.0-beta4_debian-11-x86_64.tar.gz
- 1c3d52cfa72a9318399ec3e4bc7741b9a83d51606a185b4e4ef8df6bc95d8b71
+ https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.3-beta-debian-11-tarball/versions/v5.5.3-beta/Radar-v5.5.3-beta_debian-11-x86_64.tar.gz
+ c41c9186d2e150ca2698768367be81151b1463f8c846dbc4e82d4579ee6a8f64
diff --git a/metadata/Radar-v5.5.0-beta4-debian-12.xml b/metadata/Radar-v5.5.3-beta-debian-12.xml
similarity index 80%
rename from metadata/Radar-v5.5.0-beta4-debian-12.xml
rename to metadata/Radar-v5.5.3-beta-debian-12.xml
index 92b20ebafd..4c3c03cc3f 100644
--- a/metadata/Radar-v5.5.0-beta4-debian-12.xml
+++ b/metadata/Radar-v5.5.3-beta-debian-12.xml
@@ -2,7 +2,7 @@
Radar
- v5.5.0-beta4
+ v5.5.3-beta
Overlays the radar picture on OpenCPN
@@ -29,6 +29,6 @@ such as dual radar range and Doppler.
debian-x86_64
12
x86_64
- https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.0-beta4-debian-12-tarball/versions/v5.5.0-beta4/Radar-v5.5.0-beta4_debian-12-x86_64.tar.gz
- c15fa5e301b45b63861456ff5539c2210ab137c4c69db8cb0cc152238c5137a8
+ https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.3-beta-debian-12-tarball/versions/v5.5.3-beta/Radar-v5.5.3-beta_debian-12-x86_64.tar.gz
+ 5c71f71a331f9f08ce31e9a18673e12c5ad31fc048acf37ebc7ab64a60dcd4df
diff --git a/metadata/Radar-v5.5.0-beta4-debian-A32-11.xml b/metadata/Radar-v5.5.3-beta-debian-A32-11.xml
similarity index 80%
rename from metadata/Radar-v5.5.0-beta4-debian-A32-11.xml
rename to metadata/Radar-v5.5.3-beta-debian-A32-11.xml
index 67b3379dec..7682fda13c 100644
--- a/metadata/Radar-v5.5.0-beta4-debian-A32-11.xml
+++ b/metadata/Radar-v5.5.3-beta-debian-A32-11.xml
@@ -2,7 +2,7 @@
Radar
- v5.5.0-beta4
+ v5.5.3-beta
Overlays the radar picture on OpenCPN
@@ -29,6 +29,6 @@ such as dual radar range and Doppler.
debian-armhf
11
armhf
- https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.0-beta4-debian-A32-11-tarball/versions/v5.5.0-beta4/Radar-v5.5.0-beta4_debian-11-armhf.tar.gz
- 8a5a9c27d084df8c7fadb5209f98c778c353317bdafc6beafe806ff32157d6a7
+ https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.3-beta-debian-A32-11-tarball/versions/v5.5.3-beta/Radar-v5.5.3-beta_debian-11-armhf.tar.gz
+ 269ecb83bec6758649c2a1716dce138c2857d932bf992ddda305699835dce4b7
diff --git a/metadata/Radar-v5.5.0-beta4-debian-A32-12.xml b/metadata/Radar-v5.5.3-beta-debian-A32-12.xml
similarity index 80%
rename from metadata/Radar-v5.5.0-beta4-debian-A32-12.xml
rename to metadata/Radar-v5.5.3-beta-debian-A32-12.xml
index c529802c29..b16ad34e07 100644
--- a/metadata/Radar-v5.5.0-beta4-debian-A32-12.xml
+++ b/metadata/Radar-v5.5.3-beta-debian-A32-12.xml
@@ -2,7 +2,7 @@
Radar
- v5.5.0-beta4
+ v5.5.3-beta
Overlays the radar picture on OpenCPN
@@ -29,6 +29,6 @@ such as dual radar range and Doppler.
debian-armhf
12
armhf
- https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.0-beta4-debian-A32-12-tarball/versions/v5.5.0-beta4/Radar-v5.5.0-beta4_debian-12-armhf.tar.gz
- 594b96293fe3fd361de0dc997ab54f60356ca0d82893bf18a1dc6525a4520361
+ https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.3-beta-debian-A32-12-tarball/versions/v5.5.3-beta/Radar-v5.5.3-beta_debian-12-armhf.tar.gz
+ bb2cd3e0ff671c51a59ab068e766defe5f47ace8507610598be095cdc42ba58f
diff --git a/metadata/Radar-v5.5.0-beta4-debian-A64-11.xml b/metadata/Radar-v5.5.3-beta-debian-A64-11.xml
similarity index 80%
rename from metadata/Radar-v5.5.0-beta4-debian-A64-11.xml
rename to metadata/Radar-v5.5.3-beta-debian-A64-11.xml
index 8da30b95ae..0369784ab7 100644
--- a/metadata/Radar-v5.5.0-beta4-debian-A64-11.xml
+++ b/metadata/Radar-v5.5.3-beta-debian-A64-11.xml
@@ -2,7 +2,7 @@
Radar
- v5.5.0-beta4
+ v5.5.3-beta
Overlays the radar picture on OpenCPN
@@ -29,6 +29,6 @@ such as dual radar range and Doppler.
debian-arm64
11
arm64
- https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.0-beta4-debian-A64-11-tarball/versions/v5.5.0-beta4/Radar-v5.5.0-beta4_debian-11-arm64.tar.gz
- cb731ea5a7330de5961fe4a90561189b28aadc30d9feb95e07adcaab10815669
+ https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.3-beta-debian-A64-11-tarball/versions/v5.5.3-beta/Radar-v5.5.3-beta_debian-11-arm64.tar.gz
+ faa87e562b850a06e3a9c7602cb72a7ac27ea73a84159c3743a55976ba9be3de
diff --git a/metadata/Radar-v5.5.0-beta4-debian-A64-12.xml b/metadata/Radar-v5.5.3-beta-debian-A64-12.xml
similarity index 80%
rename from metadata/Radar-v5.5.0-beta4-debian-A64-12.xml
rename to metadata/Radar-v5.5.3-beta-debian-A64-12.xml
index ee7b4e7527..fb93464072 100644
--- a/metadata/Radar-v5.5.0-beta4-debian-A64-12.xml
+++ b/metadata/Radar-v5.5.3-beta-debian-A64-12.xml
@@ -2,7 +2,7 @@
Radar
- v5.5.0-beta4
+ v5.5.3-beta
Overlays the radar picture on OpenCPN
@@ -29,6 +29,6 @@ such as dual radar range and Doppler.
debian-arm64
12
arm64
- https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.0-beta4-debian-A64-12-tarball/versions/v5.5.0-beta4/Radar-v5.5.0-beta4_debian-12-arm64.tar.gz
- 42a5a957457d02f80643c4403e1f8c66c43ae54cb2422e44f8960e7cc72caf23
+ https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.3-beta-debian-A64-12-tarball/versions/v5.5.3-beta/Radar-v5.5.3-beta_debian-12-arm64.tar.gz
+ 917800a3192a61dec7a6c4cf8708bc2c224c0c1dbbcd1f8494a4f22a69d3cb92
diff --git a/metadata/Radar-v5.5.0-beta4-debian-wx32-A32-11.xml b/metadata/Radar-v5.5.3-beta-debian-wx32-A32-11.xml
similarity index 79%
rename from metadata/Radar-v5.5.0-beta4-debian-wx32-A32-11.xml
rename to metadata/Radar-v5.5.3-beta-debian-wx32-A32-11.xml
index 536808b835..f9a3c02ad0 100644
--- a/metadata/Radar-v5.5.0-beta4-debian-wx32-A32-11.xml
+++ b/metadata/Radar-v5.5.3-beta-debian-wx32-A32-11.xml
@@ -2,7 +2,7 @@
Radar
- v5.5.0-beta4
+ v5.5.3-beta
Overlays the radar picture on OpenCPN
@@ -29,6 +29,6 @@ such as dual radar range and Doppler.
debian-wx32-armhf
11
armhf
- https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.0-beta4-debian-wx32-A32-11-tarball/versions/v5.5.0-beta4/Radar-v5.5.0-beta4_debian-wx32-11-armhf.tar.gz
- f42344036a775dbda56059b849e5b1f98b5326520d14baed60eb839010d48656
+ https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.3-beta-debian-wx32-A32-11-tarball/versions/v5.5.3-beta/Radar-v5.5.3-beta_debian-wx32-11-armhf.tar.gz
+ aee2818f9cb38f4906597379eb65a927957331db7c2c4185db4a4fd6471e6914
diff --git a/metadata/Radar-v5.5.0-beta4-debian-wx32-A64-11.xml b/metadata/Radar-v5.5.3-beta-debian-wx32-A64-11.xml
similarity index 79%
rename from metadata/Radar-v5.5.0-beta4-debian-wx32-A64-11.xml
rename to metadata/Radar-v5.5.3-beta-debian-wx32-A64-11.xml
index 1e7205b13a..c74d308909 100644
--- a/metadata/Radar-v5.5.0-beta4-debian-wx32-A64-11.xml
+++ b/metadata/Radar-v5.5.3-beta-debian-wx32-A64-11.xml
@@ -2,7 +2,7 @@
Radar
- v5.5.0-beta4
+ v5.5.3-beta
Overlays the radar picture on OpenCPN
@@ -29,6 +29,6 @@ such as dual radar range and Doppler.
debian-wx32-arm64
11
arm64
- https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.0-beta4-debian-wx32-A64-11-tarball/versions/v5.5.0-beta4/Radar-v5.5.0-beta4_debian-wx32-11-arm64.tar.gz
- 8d3a740a9befbdd64dab46bb3e0b218b8c5fd959521ee05a6ba249165421e03e
+ https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.3-beta-debian-wx32-A64-11-tarball/versions/v5.5.3-beta/Radar-v5.5.3-beta_debian-wx32-11-arm64.tar.gz
+ f76d5c32ff3b9572ccc1e321ad9a19dc7fb49e4cae479ddef2cfb85fc21b29d6
diff --git a/metadata/Radar-v5.5.0-beta4-debian-wx32-11.xml b/metadata/Radar-v5.5.3-beta-debian-wx32.wx32-11.xml
similarity index 76%
rename from metadata/Radar-v5.5.0-beta4-debian-wx32-11.xml
rename to metadata/Radar-v5.5.3-beta-debian-wx32.wx32-11.xml
index 0356a4758a..cdfc395013 100644
--- a/metadata/Radar-v5.5.0-beta4-debian-wx32-11.xml
+++ b/metadata/Radar-v5.5.3-beta-debian-wx32.wx32-11.xml
@@ -1,8 +1,8 @@
-
+
Radar
- v5.5.0-beta4
+ v5.5.3-beta
Overlays the radar picture on OpenCPN
@@ -29,6 +29,6 @@ such as dual radar range and Doppler.
debian-wx32-x86_64
11
x86_64
- https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.0-beta4-debian-wx32-11-tarball/versions/v5.5.0-beta4/Radar-v5.5.0-beta4_debian-wx32-11-x86_64.tar.gz
- a53da02d3ac864dbce10c2cb246c3a65cc7e1367c23666ada26b5b3f2287e06b
+ https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.3-beta-debian-wx32.wx32-11-tarball/versions/v5.5.3-beta/Radar-v5.5.3-beta_debian-wx32.wx32-11-x86_64.tar.gz
+ 378eb7b3497d874ff3d4e6119e4ad2906b9df2484d1dd34ebf6510950a2d0bc0
diff --git a/metadata/Radar-v5.5.0-beta4-flatpak-22.08.xml b/metadata/Radar-v5.5.3-beta-flatpak-22.08.xml
similarity index 76%
rename from metadata/Radar-v5.5.0-beta4-flatpak-22.08.xml
rename to metadata/Radar-v5.5.3-beta-flatpak-22.08.xml
index 67e490d7f1..3981839579 100644
--- a/metadata/Radar-v5.5.0-beta4-flatpak-22.08.xml
+++ b/metadata/Radar-v5.5.3-beta-flatpak-22.08.xml
@@ -1,8 +1,8 @@
-
+
Radar
- v5.5.0-beta4
+ v5.5.3-beta
Overlays the radar picture on OpenCPN
@@ -29,6 +29,6 @@ such as dual radar range and Doppler.
flatpak-x86_64
22.08
x86_64
- https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.0-beta4-flatpak-22.08-tarball/versions/v5.5.0-beta4/Radar-v5.5.0-beta4_flatpak-22.08-x86_64.tar.gz
- 54129dd3f2f93c841e3c28796a6340eb442884d223dcc706d77e2bfa5b22bc56
+ https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.3-beta-flatpak-22.08-tarball/versions/v5.5.3-beta/Radar-v5.5.3-beta_flatpak-22.08-x86_64.tar.gz
+ 33b7f36592a8eaf0d73536b5d5272a00ce939ffa490ecae4b350ccc9f19e927f
diff --git a/metadata/Radar-v5.5.0-beta4-flatpak-A64-22.08.xml b/metadata/Radar-v5.5.3-beta-flatpak-A64-22.08.xml
similarity index 76%
rename from metadata/Radar-v5.5.0-beta4-flatpak-A64-22.08.xml
rename to metadata/Radar-v5.5.3-beta-flatpak-A64-22.08.xml
index 8001eaf6f0..0456532f6d 100644
--- a/metadata/Radar-v5.5.0-beta4-flatpak-A64-22.08.xml
+++ b/metadata/Radar-v5.5.3-beta-flatpak-A64-22.08.xml
@@ -1,8 +1,8 @@
-
+
Radar
- v5.5.0-beta4
+ v5.5.3-beta
Overlays the radar picture on OpenCPN
@@ -29,6 +29,6 @@ such as dual radar range and Doppler.
flatpak-aarch64
22.08
aarch64
- https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.0-beta4-flatpak-A64-22.08-tarball/versions/v5.5.0-beta4/Radar-v5.5.0-beta4_flatpak-22.08-aarch64.tar.gz
- d44bd02707143e00a04eb2adfc16b30f7d9ff00ad65342123dc343dee94880d7
+ https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.3-beta-flatpak-A64-22.08-tarball/versions/v5.5.3-beta/Radar-v5.5.3-beta_flatpak-22.08-aarch64.tar.gz
+ 87083d9eb40b8125029d41836057283d5a4d32c01cbbdccd43eb0d9349b4ceb2
diff --git a/metadata/Radar-v5.5.0-beta4-msvc-wx32-10.xml b/metadata/Radar-v5.5.3-beta-msvc-wx32-10.xml
similarity index 78%
rename from metadata/Radar-v5.5.0-beta4-msvc-wx32-10.xml
rename to metadata/Radar-v5.5.3-beta-msvc-wx32-10.xml
index 1fba50477e..5a63dd01a4 100644
--- a/metadata/Radar-v5.5.0-beta4-msvc-wx32-10.xml
+++ b/metadata/Radar-v5.5.3-beta-msvc-wx32-10.xml
@@ -1,34 +1,34 @@
-
-
-
- Radar
- v5.5.0-beta4
-
- Overlays the radar picture on OpenCPN
-
- 1.16
- yes
- Hakan Svensson / Douwe Fokkema / Kees Verruijt / David S Register
-
- https://opencpn.org/OpenCPN/plugins/radarPI.html
-
- Garmin, Navico and Raymarine radar support
-
-WARNING: OPENGL MODE IS REQUIRED!
-
-Works with Garmin HD, xHD, Navico BR24, 3G, 4G, HALOxx and several Raymarine radars.
-
-When a compass heading is provided it will allow radar overlay on the chart(s).
-It also allows separate display of a traditional radar picture (PPI).
-
-Supports MARPA (even on radars that do not support this themselves),
-Guard zones, AIS overlay on PPI, and various radar dependent features
-such as dual radar range and Doppler.
-
-
- msvc-wx32
- 10
- x86_64
- https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.0-beta4-msvc-wx32-10-tarball/versions/v5.5.0-beta4/Radar-v5.5.0-beta4_msvc-wx32-10-win32.tar.gz
- 81595a0878684f3eaca3fbb2e5472c7da2e466ac5a97579872628f7f7657b809
-
+
+
+
+ Radar
+ v5.5.3-beta
+
+ Overlays the radar picture on OpenCPN
+
+ 1.16
+ yes
+ Hakan Svensson / Douwe Fokkema / Kees Verruijt / David S Register
+
+ https://opencpn.org/OpenCPN/plugins/radarPI.html
+
+ Garmin, Navico and Raymarine radar support
+
+WARNING: OPENGL MODE IS REQUIRED!
+
+Works with Garmin HD, xHD, Navico BR24, 3G, 4G, HALOxx and several Raymarine radars.
+
+When a compass heading is provided it will allow radar overlay on the chart(s).
+It also allows separate display of a traditional radar picture (PPI).
+
+Supports MARPA (even on radars that do not support this themselves),
+Guard zones, AIS overlay on PPI, and various radar dependent features
+such as dual radar range and Doppler.
+
+
+ msvc-wx32
+ 10
+ x86_64
+ https://dl.cloudsmith.io/public/opencpn-radar-pi/opencpn-radar-pi-beta/raw/names/Radar-v5.5.3-beta-msvc-wx32-10-tarball/versions/v5.5.3-beta/Radar-v5.5.3-beta_msvc-wx32-10-win32.tar.gz
+ 5bad06dd47f6632514469a72674186100fa4b631d19e6217c73da6f0dbae5fcf
+
diff --git a/pre-commit b/pre-commit
index b5b12b03fc..7257346736 100755
--- a/pre-commit
+++ b/pre-commit
@@ -5,9 +5,11 @@
# - Copy to .git/hooks to activate.
# - Use --no-verify to override.
+set -euo pipefail
+
function files_to_update()
{
- git diff --cached --name-status | grep -v ^D | awk '$1 $2 { print $2}'
+ git diff --cached --name-status | grep -v ^D | awk '{print $NF}'
}
topdir=$( git rev-parse --show-toplevel )
here=$(dirname $0)
@@ -15,8 +17,11 @@ here=$(dirname $0)
XML_SOURCES=( $( files_to_update | grep -E '\.xml$'))
if [ -n "$XML_SOURCES" ]; then
- xmllint --schema $topdir/ocpn-plugin.xsd $XML_SOURCES --noout || exit 1
- python $here/../../tools/check-metadata-urls $XML_SOURCES || exit 1
+ for f in "${XML_SOURCES[@]}"
+ do
+ xmllint --schema "${topdir}/ocpn-plugin.xsd" "${f}" --noout || exit 1
+ python "${here}/../../tools/check-metadata-urls" "${f}" || exit 1
+ done
fi
# If there are whitespace errors, print the offending file names and fail.