From 8ce7c4f08b7cc1cf1b609686ac00d1bc0d94236a Mon Sep 17 00:00:00 2001 From: Peter Steinberger Date: Tue, 21 Apr 2026 11:03:34 +0100 Subject: [PATCH] fix: support older shells in parallels smoke --- scripts/e2e/parallels-linux-smoke.sh | 3 ++- scripts/e2e/parallels-npm-update-smoke.sh | 3 ++- scripts/e2e/parallels-windows-smoke.sh | 9 +++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/scripts/e2e/parallels-linux-smoke.sh b/scripts/e2e/parallels-linux-smoke.sh index 968f6e3ebcf..750c0aa334a 100644 --- a/scripts/e2e/parallels-linux-smoke.sh +++ b/scripts/e2e/parallels-linux-smoke.sh @@ -230,6 +230,7 @@ import json import os import re import sys +from typing import Optional payload = json.loads(os.environ["PRL_VM_JSON"]) requested = os.environ["REQUESTED_VM_NAME"].strip() @@ -237,7 +238,7 @@ requested_lower = requested.lower() explicit = os.environ["VM_NAME_EXPLICIT"] == "1" names = [str(item.get("name", "")).strip() for item in payload if str(item.get("name", "")).strip()] -def parse_ubuntu_version(name: str) -> tuple[int, ...] | None: +def parse_ubuntu_version(name: str) -> Optional[tuple[int, ...]]: match = re.search(r"ubuntu\s+(\d+(?:\.\d+)*)", name, re.IGNORECASE) if not match: return None diff --git a/scripts/e2e/parallels-npm-update-smoke.sh b/scripts/e2e/parallels-npm-update-smoke.sh index 6919db4faf6..c48d2a69a30 100755 --- a/scripts/e2e/parallels-npm-update-smoke.sh +++ b/scripts/e2e/parallels-npm-update-smoke.sh @@ -196,13 +196,14 @@ import json import os import re import sys +from typing import Optional payload = json.loads(os.environ["PRL_VM_JSON"]) requested = os.environ["REQUESTED_VM_NAME"].strip() requested_lower = requested.lower() names = [str(item.get("name", "")).strip() for item in payload if str(item.get("name", "")).strip()] -def parse_ubuntu_version(name: str) -> tuple[int, ...] | None: +def parse_ubuntu_version(name: str) -> Optional[tuple[int, ...]]: match = re.search(r"ubuntu\s+(\d+(?:\.\d+)*)", name, re.IGNORECASE) if not match: return None diff --git a/scripts/e2e/parallels-windows-smoke.sh b/scripts/e2e/parallels-windows-smoke.sh index 4443ec2f8e6..49720a501df 100644 --- a/scripts/e2e/parallels-windows-smoke.sh +++ b/scripts/e2e/parallels-windows-smoke.sh @@ -937,10 +937,11 @@ EOF } ensure_mingit_zip() { - local mingit_name mingit_url - mapfile -t mingit_meta < <(resolve_mingit_download) - mingit_name="${mingit_meta[0]}" - mingit_url="${mingit_meta[1]}" + local mingit_name mingit_url mingit_meta + mingit_meta="$(resolve_mingit_download)" + mingit_name="${mingit_meta%%$'\n'*}" + mingit_url="${mingit_meta#*$'\n'}" + [[ "$mingit_name" != "$mingit_url" ]] || die "failed to resolve MinGit download metadata" MINGIT_ZIP_NAME="$mingit_name" MINGIT_ZIP_PATH="$MAIN_TGZ_DIR/$mingit_name" if [[ ! -f "$MINGIT_ZIP_PATH" ]]; then