avoid using ComObject

Because WIndows Server Core cannot use ComObject, use `[System.Reflection.Assembly]::LoadWithPartialName("System.IO.Compression.FileSystem")` instead.
cosmo0920 · Jul 4, 2014 · 7b3b6df · 7b3b6df
1 parent d82e23f
commit 7b3b6df
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/powershell/install-cmake.ps1 b/powershell/install-cmake.ps1
@@ -6,7 +6,7 @@ $pathToZip = "$pwd\cmake.zip"
 $targetDir = "$pwd\cmake"
 #Load the assembly
 [System.Reflection.Assembly]::LoadWithPartialName("System.IO.Compression.FileSystem") | Out-Null
-[System.IO.Compression.ZipFile]::ExtractToDirectory($pathToZip, $targetDir)
+[System.IO.Compression.ZipFile]::ExtractToDirectory($pathToZip, $pwd)
 
 # set Path
-$Env:Path = "$targetDir\cmake-${cmakeVersion}\win32-x86;" + $Env:Path
+$Env:Path = ".\cmake-${cmakeVersion}-win32-x86\bin;" + $Env:Path
diff --git a/powershell/package-unzip.ps1 b/powershell/package-unzip.ps1
@@ -3,11 +3,9 @@
 
 function unzipMrnPackage($workDir, $mariaDBVer, $arch) {
   $file = "$workDir\mariadb-$mariadbVer-$arch.zip"
-  $shell = New-Object -ComObject shell.application
-  $zip = $shell.NameSpace($file)
-  $dest =  $shell.NameSpace((Split-Path $file -Parent))
-
-  $dest.CopyHere($zip.Items())
+  #Load the assembly
+  [System.Reflection.Assembly]::LoadWithPartialName("System.IO.Compression.FileSystem") | Out-Null
+  [System.IO.Compression.ZipFile]::ExtractToDirectory($file, $pwd)
 }
 
 cd $workDir

diff --git a/powershell/unzip.ps1 b/powershell/unzip.ps1
@@ -8,8 +8,7 @@ if (Test-Path -path "$nightly") {
 }
 
 $file = $(Get-ChildItem $zipname).FullName
-$shell = New-Object -ComObject shell.application
-$zip = $shell.NameSpace($file)
-$dest =  $shell.NameSpace((Split-Path $file -Parent))
 
-$dest.CopyHere($zip.Items())
+#Load the assembly
+[System.Reflection.Assembly]::LoadWithPartialName("System.IO.Compression.FileSystem") | Out-Null
+[System.IO.Compression.ZipFile]::ExtractToDirectory($file, $pwd)