[releng] Fix case where copyright year end == start

Change-Id: I4e96c000a307003946195823fce1f7322b3a4a01

4 files changed, 12 insertions, 8 deletions

diff --git a/launch/org.eclipse.cdt.flatpak.launcher/META-INF/MANIFEST.MF b/launch/org.eclipse.cdt.flatpak.launcher/META-INF/MANIFEST.MF
index 894dfb3876b..c8b42462e33 100644
--- a/launch/org.eclipse.cdt.flatpak.launcher/META-INF/MANIFEST.MF
+++ b/launch/org.eclipse.cdt.flatpak.launcher/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.cdt.flatpak.launcher;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.100.qualifier
 Bundle-Activator: org.eclipse.cdt.flatpak.launcher.FlatpakLaunchPlugin
 Bundle-Vendor: %Plugin.vendor
 Bundle-Localization: plugin
diff --git a/launch/org.eclipse.cdt.flatpak.launcher/about.properties b/launch/org.eclipse.cdt.flatpak.launcher/about.properties
index 2abed63a83b..f7acfdfc13e 100644
--- a/launch/org.eclipse.cdt.flatpak.launcher/about.properties
+++ b/launch/org.eclipse.cdt.flatpak.launcher/about.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2020, 2020 Contributors to the Eclipse Foundation
+# Copyright (c) 2020, 2021 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
@@ -24,7 +24,7 @@ blurb=C/C++ Flatpak Launch Support\n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-Copyright (c) 2020, 2020 Contributors to the Eclipse Foundation
+Copyright (c) 2020, 2021 Contributors to the Eclipse Foundation
 \n\
 See the NOTICE file(s) distributed with this work for additional\n\
 information regarding copyright ownership.\n\
diff --git a/releng/scripts/check_features.sh b/releng/scripts/check_features.sh
index fc96aaf9a8e..56172821195 100755
--- a/releng/scripts/check_features.sh
+++ b/releng/scripts/check_features.sh
@@ -61,9 +61,13 @@ git ls-files -- \*/feature.xml | while read feature_xml; do
     esac
     feature_end_year=$(git log --format='%ad' --date="format:%Y" -- $feature_xml $plugin_dir | head -1)
     feature_name=$(grep featureName= $feature_dir/feature.properties | sed '-es,featureName=,,')
-    export feature_start_year feature_end_year feature_name
-
-    envsubst '$feature_start_year $feature_end_year $feature_name'  < \
+    if [ "$feature_start_year" = "$feature_end_year" ]; then
+        feature_years="${feature_start_year}"
+    else
+        feature_years="${feature_start_year}, ${feature_end_year}"
+    fi
+    export feature_years feature_name
+    envsubst '$feature_years $feature_name'  < \
         releng/templates/feature/about.properties > \
         ${plugin_dir}/about.properties
 
diff --git a/releng/templates/feature/about.properties b/releng/templates/feature/about.properties
index a6c2eaa7fcf..3ca3eea8387 100644
--- a/releng/templates/feature/about.properties
+++ b/releng/templates/feature/about.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) ${feature_start_year}, ${feature_end_year} Contributors to the Eclipse Foundation
+# Copyright (c) ${feature_years} Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
@@ -24,7 +24,7 @@ blurb=${feature_name}\n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-Copyright (c) ${feature_start_year}, ${feature_end_year} Contributors to the Eclipse Foundation
+Copyright (c) ${feature_years} Contributors to the Eclipse Foundation
 \n\
 See the NOTICE file(s) distributed with this work for additional\n\
 information regarding copyright ownership.\n\