Windows, OpenSSH: Include .zip file extension when downloading

This script currently downloads the .zip file from the web into a local
file with no file extension. This can cause issues for 7-zip when
unarchiving. This patch fixes this.

As a drive-by, we improve the names of some variables.

Pick-to: 6.8
Change-Id: Icb1b24646b54d75d825764d30a268fa6e55d0183
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit 99b67a8f3f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 3897e68506)

.gitmodules

@@ -1,40 +1,40 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 6.10.3
+	branch = 6.10
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 6.10.3
+	branch = 6.10
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 6.10.3
+	branch = 6.10
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 6.10.3
+	branch = 6.10
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
 	recommends = qtdeclarative qtquick3d
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 6.10.3
+	branch = 6.10
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 6.10.3
+	branch = 6.10
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
@@ -47,7 +47,7 @@
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 6.10.3
+	branch = 6.10
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -55,7 +55,7 @@
 	recommends = qtmultimedia qtshadertools qtwebengine
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 6.10.3
+	branch = 6.10
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -68,7 +68,7 @@
 	depends = qtbase
 	path = qtqa
 	url = ../qtqa.git
-	branch = 6.10.3
+	branch = 6.10
 	status = essential
 	priority = 50
 [submodule "qtlocation"]
@@ -76,21 +76,21 @@
 	recommends = qtdeclarative
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 6.10.3
+	branch = 6.10
 	status = preview
 [submodule "qtpositioning"]
 	depends = qtbase
 	recommends = qtdeclarative qtserialport
 	path = qtpositioning
 	url = ../qtpositioning.git
-	branch = 6.10.3
+	branch = 6.10
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 6.10.3
+	branch = 6.10
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -117,61 +117,61 @@
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 6.10.3
+	branch = 6.10
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 6.10.3
+	branch = 6.10
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools qtmultimedia
 	path = qt3d
 	url = ../qt3d.git
-	branch = 6.10.3
+	branch = 6.10
 	status = deprecated
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 6.10.3
+	branch = 6.10
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 6.10.3
+	branch = 6.10
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 6.10.3
+	branch = 6.10
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 6.10.3
+	branch = 6.10
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 6.10.3
+	branch = 6.10
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtwebchannel qttools qtpositioning
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 6.10.3
+	branch = 6.10
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
@@ -185,28 +185,28 @@
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 6.10.3
+	branch = 6.10
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 6.10.3
+	branch = 6.10
 	status = deprecated
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 6.10.3
+	branch = 6.10
 	status = deprecated
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 6.10.3
+	branch = 6.10
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
@@ -219,27 +219,27 @@
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 6.10.3
+	branch = 6.10
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase qtmultimedia
 	recommends = qtdeclarative
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 6.10.3
+	branch = 6.10
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 6.10.3
+	branch = 6.10
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 6.10.3
+	branch = 6.10
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
@@ -252,88 +252,88 @@
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = 6.10.3
+	branch = 6.10
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 6.10.3
+	branch = 6.10
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 6.10.3
+	branch = 6.10
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = 6.10.3
+	branch = 6.10
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = 6.10.3
+	branch = 6.10
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = 6.10.3
+	branch = 6.10
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	recommends = qtwebsockets
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = 6.10.3
+	branch = 6.10
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = 6.10.3
+	branch = 6.10
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = 6.10.3
+	branch = 6.10
 	status = preview
 [submodule "qthttpserver"]
 	depends = qtbase
 	recommends = qtwebsockets
 	path = qthttpserver
 	url = ../qthttpserver.git
-	branch = 6.10.3
+	branch = 6.10
 	status = addon
 [submodule "qtquick3dphysics"]
 	depends = qtbase qtdeclarative qtquick3d qtshadertools
 	path = qtquick3dphysics
 	url = ../qtquick3dphysics.git
-	branch = 6.10.3
+	branch = 6.10
 	status = addon
 [submodule "qtgrpc"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgrpc
 	url = ../qtgrpc.git
-	branch = 6.10.3
+	branch = 6.10
 	status = addon
 [submodule "qtquickeffectmaker"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquick3d
 	path = qtquickeffectmaker
 	url = ../qtquickeffectmaker.git
-	branch = 6.10.3
+	branch = 6.10
 	status = addon
 [submodule "qtgraphs"]
 	depends = qtbase qtdeclarative qtquick3d
 	path = qtgraphs
 	url = ../qtgraphs.git
-	branch = 6.10.3
+	branch = 6.10
 	status = addon

coin/provisioning/common/windows/install-openssh.ps1

@@ -10,17 +10,17 @@ $temp = "$env:tmp"
 $cpu_arch = Get-CpuArchitecture
 switch ($cpu_arch) {
     arm64 {
-        $zipPackage = "OpenSSH-ARM64"
+        $base_file_name = "OpenSSH-ARM64"
         $sha1 = "ca3e8f44a550b7ae71c8e122acd4ed905d66feb0"
         Break
     }
     x64 {
-        $zipPackage = "OpenSSH-Win64"
+        $base_file_name = "OpenSSH-Win64"
         $sha1 = "1397d40d789ae0911b3cc818b9dcd9321fed529b"
         Break
     }
     x86 {
-        $zipPackage = "OpenSSH-Win32"
+        $base_file_name = "OpenSSH-Win32"
         $sha1 = "4642C62F72C108C411E27CE282A863791B63329B"
         Break
     }
@@ -29,20 +29,27 @@ switch ($cpu_arch) {
     }
 }
 
-Write-Host "Fetching $zipPackage $version..."
+Write-Host "Fetching $base_file_name $version..."
-$url_cache = "http://ci-files01-hki.ci.qt.io/input/windows/openssh/" + $version + "/" + $zipPackage + ".zip"
+$url_cache = "http://ci-files01-hki.ci.qt.io/input/windows/openssh/$version/$base_file_name.zip"
-$url_official = "https://github.com/PowerShell/Win32-OpenSSH/releases/download/" + $version + "/" + $zipPackage + ".zip"
+$url_official = "https://github.com/PowerShell/Win32-OpenSSH/releases/download/$version/$base_file_name.zip"
-Download $url_official $url_cache "$temp\$zipPackage"
+$output_zip_file = "$temp\$base_file_name.zip"
-Verify-Checksum "$temp\$zipPackage" $sha1
+Download $url_official $url_cache $output_zip_file
+Verify-Checksum $output_zip_file $sha1
 
 Write-Host "Extracting the package"
-Extract-7Zip "$temp\$zipPackage" C:\"Program Files"
+Extract-7Zip $output_zip_file "C:\Program Files"
+# We assume the incoming zip contains exactly one directory, named the same
+# as the base file name of th zip.
+$output_dir = "C:\Program Files\$base_file_name"
+if (-not (Test-Path $output_dir -PathType Container)) {
+    throw "Error. Expected output directory '$output_dir' does not exist."
+}
 
-Write-Host "Installing $zipPackage $version..."
+Write-Host "Installing $base_file_name $version..."
-$path = "C:\Program Files\" + $zipPackage + "\install-sshd.ps1"
+$install_script = "$output_dir\install-sshd.ps1"
 
 # Installation done as shown at https://github.com/PowerShell/Win32-OpenSSH/wiki/Install-Win32-OpenSSH
-powershell.exe -ExecutionPolicy Bypass -File $path
+powershell.exe -ExecutionPolicy Bypass -File $install_script
 netsh advfirewall firewall add rule name=sshd dir=in action=allow protocol=TCP localport=22
 net start sshd
 Set-Service sshd -StartupType Automatic

coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/93-axivion-bauhaus-suite.sh

@@ -22,10 +22,10 @@ DownloadAndExtract () {
 
 
 # Axivion Bauhaus Suite
-version="7.11.1"
+version="7.11.3"
 sourceFile="http://ci-files01-hki.ci.qt.io/input/axivion/bauhaus-suite-$version-x86_64-gnu_linux.tar.gz"
 targetFile="bauhaus-suite.tar.gz"
-sha1="5ec7bfacca1827dbf1fc70dcef4d9bfd842396aa"
+sha1="8ca558908b38ca99500b7e0687609a1531b19121"
 cd "$HOME"
 DownloadAndExtract "$sourceFile" "$sha1" "$targetFile"
 

coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/93-axivion-bauhaus-suite.sh

@@ -22,10 +22,10 @@ DownloadAndExtract () {
 
 
 # Axivion Bauhaus Suite
-version="7.11.1"
+version="7.11.3"
 sourceFile="http://ci-files01-hki.ci.qt.io/input/axivion/bauhaus-suite-$version-x86_64-gnu_linux.tar.gz"
 targetFile="bauhaus-suite.tar.gz"
-sha1="5ec7bfacca1827dbf1fc70dcef4d9bfd842396aa"
+sha1="8ca558908b38ca99500b7e0687609a1531b19121"
 cd "$HOME"
 DownloadAndExtract "$sourceFile" "$sha1" "$targetFile"