Skip to content

Commit c4863b0

Browse files
ViacheslavKlimovclaude
authored andcommitted
Fix upgrade script notice: use 4.2.1+ instead of 4.2.1.x to cover 4.2.2
The "must run upgrade script" text used previous_version with .x suffix (e.g., 4.2.1.x) which excluded later maintenance versions like 4.2.2. Replace .x with + so the notice correctly covers all versions that require the upgrade script (e.g., 4.2.1+ includes 4.2.1.x and 4.2.2). Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 343f51e commit c4863b0

6 files changed

Lines changed: 12 additions & 6 deletions

File tree

_includes/centos-upgrade-instructions.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,9 @@ Package installer may ask you to merge your ThingsBoard configuration. It is pre
163163
{% capture update_note %}
164164
{% assign base_version_parts = base_version | split: "." %}
165165
{% assign patch_part = base_version_parts[2] %}
166+
{% assign prev_version_script = previous_version %}{% if previous_version contains ".x" %}{% assign prev_version_script = previous_version | replace: ".x", "+" %}{% endif %}
166167
{% if patch_status == "true" %}
167-
{% if is_latest_patch == "true" %}{% assign prev_maintenance = patch_part | minus: 1 %}If you are upgrading from {{ previous_version }}, you **must** run the script below. However, if you are upgrading from version {{ family | append: "." | append: prev_maintenance | append: "+" }}, **DO NOT** run the upgrade script; proceed directly to starting the service.{% else %}If you are upgrading from {{ previous_version }}, you **must** run the script below. However, if you are upgrading from version {{ family | append: "." | append: patch_part | append: ".x" }}, **DO NOT** run the upgrade script; proceed directly to starting the service.{% endif %}
168+
{% if is_latest_patch == "true" %}{% assign prev_maintenance = patch_part | minus: 1 %}If you are upgrading from {{ prev_version_script }}, you **must** run the script below. However, if you are upgrading from version {{ family | append: "." | append: prev_maintenance | append: "+" }}, **DO NOT** run the upgrade script; proceed directly to starting the service.{% else %}If you are upgrading from {{ prev_version_script }}, you **must** run the script below. However, if you are upgrading from version {{ family | append: "." | append: patch_part | append: ".x" }}, **DO NOT** run the upgrade script; proceed directly to starting the service.{% endif %}
168169
{% else %}
169170
If you are upgrading from version {{ previous_version }}, you must run the script below
170171
{% endif %}

_includes/docs/pe/user-guide/install/new-docker-upgrade-steps.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
{% capture update_note %}
66
{% assign base_version_parts = base_version | split: "." %}
77
{% assign patch_part = base_version_parts[2] %}
8+
{% assign prev_version_script = previous_version %}{% if previous_version contains ".x" %}{% assign prev_version_script = previous_version | replace: ".x", "+" %}{% endif %}
89
{% if patch_status == "true" %}
9-
{% if is_latest_patch == "true" %}{% assign prev_maintenance = patch_part | minus: 1 %}If you are upgrading from {{ previous_version }}, you **must** run the script below. However, if you are upgrading from version {{ family | append: "." | append: prev_maintenance | append: "+" }}, **DO NOT** run the upgrade script; proceed directly to starting the service.{% else %}If you are upgrading from {{ previous_version }}, you **must** run the script below. However, if you are upgrading from version {{ family | append: "." | append: patch_part | append: ".x" }}, **DO NOT** run the upgrade script; proceed directly to starting the service.{% endif %}
10+
{% if is_latest_patch == "true" %}{% assign prev_maintenance = patch_part | minus: 1 %}If you are upgrading from {{ prev_version_script }}, you **must** run the script below. However, if you are upgrading from version {{ family | append: "." | append: prev_maintenance | append: "+" }}, **DO NOT** run the upgrade script; proceed directly to starting the service.{% else %}If you are upgrading from {{ prev_version_script }}, you **must** run the script below. However, if you are upgrading from version {{ family | append: "." | append: patch_part | append: ".x" }}, **DO NOT** run the upgrade script; proceed directly to starting the service.{% endif %}
1011
{% else %}
1112
If you are upgrading from version {{ previous_version }}, you must run the script below
1213
{% endif %}

_includes/docs/user-guide/install/new-docker-compose-upgrade-steps.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
{% capture update_note %}
55
{% assign base_version_parts = base_version | split: "." %}
66
{% assign patch_part = base_version_parts[2] %}
7+
{% assign prev_version_script = previous_version %}{% if previous_version contains ".x" %}{% assign prev_version_script = previous_version | replace: ".x", "+" %}{% endif %}
78
{% if patch_status == "true" %}
8-
{% if is_latest_patch == "true" %}{% assign prev_maintenance = patch_part | minus: 1 %}If you are upgrading from {{ previous_version }}, you **must** run the script below. However, if you are upgrading from version {{ family | append: "." | append: prev_maintenance | append: "+" }}, **DO NOT** run the upgrade script; proceed directly to starting the service.{% else %}If you are upgrading from {{ previous_version }}, you **must** run the script below. However, if you are upgrading from version {{ family | append: "." | append: patch_part | append: ".x" }}, **DO NOT** run the upgrade script; proceed directly to starting the service.{% endif %}
9+
{% if is_latest_patch == "true" %}{% assign prev_maintenance = patch_part | minus: 1 %}If you are upgrading from {{ prev_version_script }}, you **must** run the script below. However, if you are upgrading from version {{ family | append: "." | append: prev_maintenance | append: "+" }}, **DO NOT** run the upgrade script; proceed directly to starting the service.{% else %}If you are upgrading from {{ prev_version_script }}, you **must** run the script below. However, if you are upgrading from version {{ family | append: "." | append: patch_part | append: ".x" }}, **DO NOT** run the upgrade script; proceed directly to starting the service.{% endif %}
910
{% else %}
1011
If you are upgrading from version {{ previous_version }}, you must run the script below
1112
{% endif %}

_includes/docs/user-guide/install/new-docker-upgrade-steps.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
{% capture update_note %}
66
{% assign base_version_parts = base_version | split: "." %}
77
{% assign patch_part = base_version_parts[2] %}
8+
{% assign prev_version_script = previous_version %}{% if previous_version contains ".x" %}{% assign prev_version_script = previous_version | replace: ".x", "+" %}{% endif %}
89
{% if patch_status == "true" %}
9-
{% if is_latest_patch == "true" %}{% assign prev_maintenance = patch_part | minus: 1 %}If you are upgrading from {{ previous_version }}, you **must** run the script below. However, if you are upgrading from version {{ family | append: "." | append: prev_maintenance | append: "+" }}, **DO NOT** run the upgrade script; proceed directly to starting the service.{% else %}If you are upgrading from {{ previous_version }}, you **must** run the script below. However, if you are upgrading from version {{ family | append: "." | append: patch_part | append: ".x" }}, **DO NOT** run the upgrade script; proceed directly to starting the service.{% endif %}
10+
{% if is_latest_patch == "true" %}{% assign prev_maintenance = patch_part | minus: 1 %}If you are upgrading from {{ prev_version_script }}, you **must** run the script below. However, if you are upgrading from version {{ family | append: "." | append: prev_maintenance | append: "+" }}, **DO NOT** run the upgrade script; proceed directly to starting the service.{% else %}If you are upgrading from {{ prev_version_script }}, you **must** run the script below. However, if you are upgrading from version {{ family | append: "." | append: patch_part | append: ".x" }}, **DO NOT** run the upgrade script; proceed directly to starting the service.{% endif %}
1011
{% else %}
1112
If you are upgrading from version {{ previous_version }}, you must run the script below
1213
{% endif %}

_includes/ubuntu-upgrade-instructions.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,9 @@ Package installer may ask you to merge your ThingsBoard configuration. It is pre
156156
{% capture update_note %}
157157
{% assign base_version_parts = base_version | split: "." %}
158158
{% assign patch_part = base_version_parts[2] %}
159+
{% assign prev_version_script = previous_version %}{% if previous_version contains ".x" %}{% assign prev_version_script = previous_version | replace: ".x", "+" %}{% endif %}
159160
{% if patch_status == "true" %}
160-
{% if is_latest_patch == "true" %}{% assign prev_maintenance = patch_part | minus: 1 %}If you are upgrading from {{ previous_version }}, you **must** run the script below. However, if you are upgrading from version {{ family | append: "." | append: prev_maintenance | append: "+" }}, **DO NOT** run the upgrade script; proceed directly to starting the service.{% else %}If you are upgrading from {{ previous_version }}, you **must** run the script below. However, if you are upgrading from version {{ family | append: "." | append: patch_part | append: ".x" }}, **DO NOT** run the upgrade script; proceed directly to starting the service.{% endif %}
161+
{% if is_latest_patch == "true" %}{% assign prev_maintenance = patch_part | minus: 1 %}If you are upgrading from {{ prev_version_script }}, you **must** run the script below. However, if you are upgrading from version {{ family | append: "." | append: prev_maintenance | append: "+" }}, **DO NOT** run the upgrade script; proceed directly to starting the service.{% else %}If you are upgrading from {{ prev_version_script }}, you **must** run the script below. However, if you are upgrading from version {{ family | append: "." | append: patch_part | append: ".x" }}, **DO NOT** run the upgrade script; proceed directly to starting the service.{% endif %}
161162
{% else %}
162163
If you are upgrading from version {{ previous_version }}, you must run the script below
163164
{% endif %}

_includes/windows-upgrade-instructions.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,9 @@ net stop thingsboard
153153
{% capture update_note %}
154154
{% assign base_version_parts = base_version | split: "." %}
155155
{% assign patch_part = base_version_parts[2] %}
156+
{% assign prev_version_script = previous_version %}{% if previous_version contains ".x" %}{% assign prev_version_script = previous_version | replace: ".x", "+" %}{% endif %}
156157
{% if patch_status == "true" %}
157-
{% if is_latest_patch == "true" %}{% assign prev_maintenance = patch_part | minus: 1 %}If you are upgrading from {{ previous_version }}, you **must** run the script below. However, if you are upgrading from version {{ family | append: "." | append: prev_maintenance | append: "+" }}, **DO NOT** run the upgrade script; proceed directly to starting the service.{% else %}If you are upgrading from {{ previous_version }}, you **must** run the script below. However, if you are upgrading from version {{ family | append: "." | append: patch_part | append: ".x" }}, **DO NOT** run the upgrade script; proceed directly to starting the service.{% endif %}
158+
{% if is_latest_patch == "true" %}{% assign prev_maintenance = patch_part | minus: 1 %}If you are upgrading from {{ prev_version_script }}, you **must** run the script below. However, if you are upgrading from version {{ family | append: "." | append: prev_maintenance | append: "+" }}, **DO NOT** run the upgrade script; proceed directly to starting the service.{% else %}If you are upgrading from {{ prev_version_script }}, you **must** run the script below. However, if you are upgrading from version {{ family | append: "." | append: patch_part | append: ".x" }}, **DO NOT** run the upgrade script; proceed directly to starting the service.{% endif %}
158159
{% else %}
159160
If you are upgrading from version {{ previous_version }}, you must run the script below
160161
{% endif %}

0 commit comments

Comments
 (0)