[Git][debian-gis-team/osmosis][master] Don't fall back to osmosis-version.sh in generateJavaSources.sh.

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / osmosis


Commits:
fe21f998 by Bas Couwenberg at 2023-11-12T07:07:43+01:00
Don't fall back to osmosis-version.sh in generateJavaSources.sh.

- - - - -


1 changed file:

- debian/patches/maven.patch


Changes:

=====================================
debian/patches/maven.patch
=====================================
@@ -192,7 +192,7 @@ Forwarded: https://github.com/openstreetmap/osmosis/pull/137
 +</project>
 --- /dev/null
 +++ b/osmosis-core/generateJavaSources.sh
-@@ -0,0 +1,24 @@
+@@ -0,0 +1,17 @@
 +#!/bin/sh
 +
 +SOURCE_DIR="$(dirname "$0")"
@@ -200,15 +200,8 @@ Forwarded: https://github.com/openstreetmap/osmosis/pull/137
 +TEMPLATE_FILE="${SOURCE_FILE}.template"
 +
 +if [ -z "${VERSION}" ]; then
-+    PARENT_DIR="$(dirname "${SOURCE_DIR}")"
-+    SCRIPT_FILE="${PARENT_DIR}/osmosis-version.sh"
-+
-+    if [ ! -r "${SCRIPT_FILE}" ]; then
-+        echo "Error: Cannot read file: ${SCRIPT_FILE}"
-+        exit 1
-+    fi
-+
-+    VERSION="$(sh "${SCRIPT_FILE}")"
++    echo "Error: VERSION not set in environment"
++    exit 1
 +fi
 +
 +if [ ! -r "${TEMPLATE_FILE}" ]; then



View it on GitLab: https://salsa.debian.org/debian-gis-team/osmosis/-/commit/fe21f99812a00723484312e7faedc0bd9d852f6c

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/osmosis/-/commit/fe21f99812a00723484312e7faedc0bd9d852f6c
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20231112/9ac85792/attachment-0001.htm>