Update Miniconda.ps1

sakaztk · sakaztk · commit cde0aee4fcf2 · 2025-06-08T17:13:37.000+09:00
diff --git a/Anaconda/Anaconda.ps1 b/Anaconda/Anaconda.ps1
@@ -11,7 +11,8 @@ $ErrorActionPreference = 'Stop'
 [Net.ServicePointManager]::SecurityProtocol = 'tls12, tls11, tls'
 Push-Location $WorkingFolder
 chcp 65001
-$OutputEncoding = [System.Console]::OutputEncoding = [System.Console]::InputEncoding = [System.Text.Encoding]::GetEncoding('utf-8')
+#$OutputEncoding = [System.Console]::OutputEncoding = [System.Console]::InputEncoding = [System.Text.Encoding]::GetEncoding('utf-8')
+$OutputEncoding = [System.Text.Encoding]::GetEncoding('utf-8')
 $psBoundParameters.Keys | ForEach-Object {
     if ($($PSBoundParameters.$_.GetType().Name) -eq 'SwitchParameter') {
         $paramStrings += " -$_"
diff --git a/Anaconda/README-JP.md b/Anaconda/README-JP.md
@@ -4,7 +4,7 @@
 ## インストールするソフトウェア
 - [Anaconda](https://www.anaconda.com/)
 - [Node.js](https://nodejs.org/) (JupyterLab拡張機能の要件)
-- [Jupyter-PowerShell5](https://github.com/DeepAQ/Jupyter-PowerShell5)
+- [Jupyter-PowerShell5](https://github.com/sakaztk/Jupyter-PowerShellSDK/tree/powershellsdk/Jupyter-PowerShell5) ([DeepAQ](https://github.com/DeepAQ/Jupyter-PowerShell5)からフォーク)
 - [Jupyter-PowerShellSDK](https://github.com/sakaztk/Jupyter-PowerShellSDK) (オプション)
 - [.Net Interactive](https://github.com/dotnet/interactive) (オプション)
 
diff --git a/Anaconda/README.md b/Anaconda/README.md
@@ -4,7 +4,7 @@ Using [Powershell](https://github.com/PowerShell/PowerShell) on [Jupyter Noteboo
 ## Installing Softwares
 - [Anaconda](https://www.anaconda.com/)
 - [Node.js](https://nodejs.org/) (Use in extentions for JupyterLab)
-- [Jupyter-PowerShell5](https://github.com/DeepAQ/Jupyter-PowerShell5)
+- [Jupyter-PowerShell5](https://github.com/sakaztk/Jupyter-PowerShellSDK/tree/powershellsdk/Jupyter-PowerShell5) (forked from [DeepAQ](https://github.com/DeepAQ/Jupyter-PowerShell5))
 - [Jupyter-PowerShellSDK](https://github.com/sakaztk/Jupyter-PowerShellSDK) (Optional)
 - [.Net Interactive](https://github.com/dotnet/interactive) (Optional)
 
diff --git a/Miniconda/Miniconda.ps1 b/Miniconda/Miniconda.ps1
@@ -4,14 +4,15 @@ Param(
     [String]$InstallationType = 'Computer',
     [Switch]$InstallPwsh7SDK,
     [Switch]$InstallDotnetInteractive,
-    [Switch]$InstallNBExtensions,
-    [Switch]$UsePipKernel,
     [Switch]$CleanupDownloadFiles,
     [String]$WorkingFolder = $PSScriptRoot
 )
 $ErrorActionPreference = 'Stop'
 [Net.ServicePointManager]::SecurityProtocol = 'tls12, tls11, tls'
 Push-Location $WorkingFolder
+chcp 65001
+#$OutputEncoding = [System.Console]::OutputEncoding = [System.Console]::InputEncoding = [System.Text.Encoding]::GetEncoding('utf-8')
+$OutputEncoding = [System.Text.Encoding]::GetEncoding('utf-8')
 $psBoundParameters.Keys | ForEach-Object {
     if ($($PSBoundParameters.$_.GetType().Name) -eq 'SwitchParameter') {
         $paramStrings += " -$_"
@@ -32,15 +33,15 @@ switch ($installationType) {
         $dataPath = "$env:ProgramData"
         $kernelPath = Join-Path $env:ProgramData '\Miniconda3\share\jupyter\kernels'
         $packagePath = Join-Path $env:ProgramData '\Miniconda3\Lib\site-packages'
-        $pyTypeOpt = '--sys-prefix'
+        #$pyTypeOpt = '--sys-prefix'
         [System.Environment]::SetEnvironmentVariable('PYTHONUTF8',1,[System.EnvironmentVariableTarget]::Machine)
     }
     { @('user', 'justme') -contains $_ } {
         $condaOpt = '/InstallationType=JustMe /AddToPath=0 /RegisterPython=1 /NoRegistru=0 /Noscripts=o /S'
         $dataPath = $env:UserProfile
         $kernelPath = Join-Path $env:AppData '\jupyter\kernels'
         $packagePath = Join-Path $env:USERPROFILE '\Miniconda3\Lib\site-packages'
-        $pyTypeOpt = '--user'
+        #$pyTypeOpt = '--user'
         [System.Environment]::SetEnvironmentVariable('PYTHONUTF8',1,[System.EnvironmentVariableTarget]::User)
     }
     default {
@@ -54,50 +55,37 @@ if ($ProgressPreference -ne 'SilentlyContinue') {
     $ProgressPreference = 'SilentlyContinue'
 }
 
-Write-Verbose 'Downloading latest Miniconda...'
+Write-Host 'Downloading latest Miniconda...'
 $fileUri = 'https://repo.anaconda.com/miniconda/Miniconda3-latest-Windows-x86_64.exe'
-Invoke-WebRequest -Uri $fileUri -UseBasicParsing -OutFile (Join-Path $WorkingFolder 'miniconda.exe') -Verbose
-
-if ($InstallPwsh7ForPipKernel) {
-    Write-Verbose 'Downloading latest PowerShell 7...'
-    $releaseURI = 'https://github.com/PowerShell/PowerShell/releases'
-    $latestRelease = (Invoke-WebRequest -Uri "$releaseURI/latest" -UseBasicParsing -Headers @{'Accept'='application/json'}| ConvertFrom-Json).update_url
-    $versionString = $latestRelease -replace '.*tag/(.*)', '$1'
-    $links = (Invoke-WebRequest -Uri "$releaseURI/expanded_assets/$($versionString)" -UseBasicParsing).Links.href
-    $fileUri = 'https://github.com' + ($links | Select-String -Pattern '.*x64.msi' | Get-Unique).Tostring().Trim()
-    Write-Verbose "Download from $fileUri"
-    Invoke-WebRequest -Uri $fileUri -UseBasicParsing -OutFile (Join-Path $WorkingFolder 'pwsh.msi') -Verbose
-}
+Invoke-WebRequest -Uri $fileUri -UseBasicParsing -OutFile (Join-Path $WorkingFolder 'miniconda.exe') -Verbose:$VerbosePreference
 
 if ($InstallDotnetInteractive) {
-    Write-Verbose 'Downloading latest .NET SDK...'
+    Write-Host 'Downloading latest .NET SDK...'
     $links = (Invoke-WebRequest -Uri 'https://dotnet.microsoft.com/download' -UseBasicParsing).Links.href
     $latestVer = (($links | Select-String -Pattern '.*sdk.*windows-x64-installer') -replace '.*sdk-(([0-9]+\.){1}[0-9]+(\.[0-9]+)?)-.*', '$1' | Measure-Object -Maximum).Maximum
     $latestUri = 'https://dotnet.microsoft.com' + ($links | Select-String -Pattern ".*sdk-$latestVer-windows-x64-installer" | Get-Unique).Tostring().Trim()
     $fileUri = ((Invoke-WebRequest -Uri $latestUri -UseBasicParsing).Links.href | Select-String -Pattern '.*\.exe' | Get-Unique).Tostring().Trim()
-    Invoke-WebRequest -Uri $fileUri -UseBasicParsing -OutFile (Join-Path $WorkingFolder 'dotnet.exe') -Verbose
+    Invoke-WebRequest -Uri $fileUri -UseBasicParsing -OutFile (Join-Path $WorkingFolder 'dotnet.exe') -Verbose:$VerbosePreference
 }
 else {
-    Write-Verbose 'Downloading latest .NET Runtime...'
+    Write-Host 'Downloading latest .NET Runtime...'
     $links = (Invoke-WebRequest -Uri 'https://dotnet.microsoft.com/en-us/download/dotnet/8.0/runtime' -UseBasicParsing).Links.href
     $latestVer = (($links | Select-String -Pattern '.*runtime.*windows-x64-installer') -replace '.*runtime-(([0-9]+\.){1}[0-9]+(\.[0-9]+)?)-.*', '$1' | Measure-Object -Maximum).Maximum
     $latestUri = 'https://dotnet.microsoft.com' + ($links | Select-String -Pattern ".*runtime-$latestVer-windows-x64-installer" | Get-Unique).Tostring().Trim()
     $fileUri = ((Invoke-WebRequest -Uri $latestUri -UseBasicParsing).Links.href | Select-String -Pattern '.*\.exe' | Get-Unique).Tostring().Trim()
-    Invoke-WebRequest -Uri $fileUri -UseBasicParsing -OutFile (Join-Path $WorkingFolder 'dotnet.exe') -Verbose
+    Invoke-WebRequest -Uri $fileUri -UseBasicParsing -OutFile (Join-Path $WorkingFolder 'dotnet.exe') -Verbose:$VerbosePreference
 }
 
-if (-not($UsePipKernel)) {
-    $releaseURI = 'https://github.com/sakaztk/Jupyter-PowerShellSDK/releases'
-    $latestRelease = (Invoke-WebRequest -Uri "$releaseURI/latest" -UseBasicParsing -Headers @{'Accept'='application/json'}| ConvertFrom-Json).update_url
-    $versionString = $latestRelease -replace '.*tag/(.*)', '$1'
-    $links = (Invoke-WebRequest -Uri "$releaseURI/expanded_assets/$($versionString)" -UseBasicParsing).Links.href
-    Write-Verbose 'Downloading latest DeepAQ pwsh5 Kernel...'
-    $fileUri = 'https://github.com' + ( $links | Select-String -Pattern '.*PowerShell5.zip' | Get-Unique).Tostring().Trim()
-    Invoke-WebRequest -uri $fileUri -UseBasicParsing -OutFile (Join-Path $WorkingFolder 'PowerShell5.zip') -Verbose
-    Write-Verbose 'Downloading latest DeepAQ pwshSDK Kernel...'
-    $fileUri = 'https://github.com' + ( $links | Select-String -Pattern 'Jupyter-PowerShellSDK-7.*\.zip' | Get-Unique).Tostring().Trim()
-    Invoke-WebRequest -uri $fileUri -UseBasicParsing -OutFile (Join-Path $WorkingFolder 'PowerShellSDK.zip') -Verbose
-}
+$releaseURI = 'https://github.com/sakaztk/Jupyter-PowerShellSDK/releases'
+$latestRelease = (Invoke-WebRequest -Uri "$releaseURI/latest" -UseBasicParsing -Headers @{'Accept'='application/json'}| ConvertFrom-Json).update_url
+$versionString = $latestRelease -replace '.*tag/(.*)', '$1'
+$links = (Invoke-WebRequest -Uri "$releaseURI/expanded_assets/$($versionString)" -UseBasicParsing).Links.href
+Write-Host 'Downloading latest DeepAQ pwsh5 Kernel...'
+$fileUri = 'https://github.com' + ( $links | Select-String -Pattern '.*PowerShell5.zip' | Get-Unique).Tostring().Trim()
+Invoke-WebRequest -uri $fileUri -UseBasicParsing -OutFile (Join-Path $WorkingFolder 'PowerShell5.zip') -Verbose:$VerbosePreference
+Write-Host 'Downloading latest DeepAQ pwshSDK Kernel...'
+$fileUri = 'https://github.com' + ( $links | Select-String -Pattern 'Jupyter-PowerShellSDK-7.*\.zip' | Get-Unique).Tostring().Trim()
+Invoke-WebRequest -uri $fileUri -UseBasicParsing -OutFile (Join-Path $WorkingFolder 'PowerShellSDK.zip') -Verbose:$VerbosePreference
 
 if ($null -ne $exProgressPreference) {
     Write-Verbose "Restore $ProgressPreference to $exProgressPreference"
@@ -128,79 +116,55 @@ conda install -y notebook
 conda install -y jupyterlab
 conda install -y -c conda-forge nodejs
 
-if ($InstallNBExtensions) {
-    conda install -y -c conda-forge jupyter_nbextensions_configurator
-    jupyter nbextensions_configurator enable
-    pip install https://github.com/ipython-contrib/jupyter_contrib_nbextensions/tarball/master
-    jupyter contrib nbextension install $pyTypeOpt    
-}
-if ($UsePipKernel) {
-    pip install powershell_kernel
-    python -m powershell_kernel.install $pyTypeOpt
-    if ($InstallPwsh7ForPipKernel) {
-        Write-Verbose 'Installing PowerShell 7...'
-        Start-Process -FilePath 'pwsh.msi' -ArgumentList '/passive' -Wait
-        Copy-Item -Path "$kernelPath\powershell" -Destination "$kernelPath\powershell7" -Recurse -Force
-        $fileContent = Get-Content "$kernelPath\powershell7\kernel.json" -Raw
-        $fileContent = $filecontent -replace '"display_name": "[^"]*"','"display_name": "PowerShell 7"'
-        $fileContent = $filecontent -replace '"powershell_command": "[^"]*"',"`"powershell_command`": `"pwsh.exe`""
-        $filecontent | Set-Content "$kernelPath\powershell7\kernel.json"
-        if ($CleanupDownloadFiles) {
-            Start-Sleep -Seconds 5
-            Remove-Item 'pwsh.msi' -Force
-        }
-    }
-}
-else {
-    Write-Verbose 'Installing DeepAQ pwsh5 Kernel...'
-    $installPath = Join-Path $packagePath 'powershell5_kernel'
-    Expand-Archive -Path (Join-Path $WorkingFolder 'PowerShell5.zip') -DestinationPath $installPath -Force
-    New-Item -ItemType Directory -Path (Join-Path $kernelPath '\powershell5\') -Force
-    Invoke-WebRequest -UseBasicParsing -Verbose -Uri 'https://raw.githubusercontent.com/PowerShell/PowerShell/master/assets/Powershell_64.png' -OutFile (Join-Path $kernelPath '\powershell5\logo-64x64.png')
-    Add-Type -AssemblyName System.Drawing
-    $image = [System.Drawing.Image]::FromFile((Join-Path $kernelPath '\powershell5\logo-64x64.png'))
-    $bitmap32 = New-Object System.Drawing.Bitmap(32, 32)
-    [System.Drawing.Graphics]::FromImage($bitmap32).DrawImage($image, 0, 0, 32, 32)
-    $bitmap32.Save((Join-Path $kernelPath '\powershell5\logo-32x32.png'), [System.Drawing.Imaging.ImageFormat]::Png)
+Write-Verbose 'Installing DeepAQ pwsh5 Kernel...'
+$installPath = Join-Path $packagePath 'powershell5_kernel'
+Expand-Archive -Path (Join-Path $WorkingFolder 'PowerShell5.zip') -DestinationPath $installPath -Force
+New-Item -ItemType Directory -Path (Join-Path $kernelPath '\powershell5\') -Force
+Invoke-WebRequest -UseBasicParsing -Verbose -Uri 'https://raw.githubusercontent.com/PowerShell/PowerShell/master/assets/Powershell_64.png' -OutFile (Join-Path $kernelPath '\powershell5\logo-64x64.png')
+Add-Type -AssemblyName System.Drawing
+$image = [System.Drawing.Image]::FromFile((Join-Path $kernelPath '\powershell5\logo-64x64.png'))
+$bitmap32 = New-Object System.Drawing.Bitmap(32, 32)
+[System.Drawing.Graphics]::FromImage($bitmap32).DrawImage($image, 0, 0, 32, 32)
+$bitmap32.Save((Join-Path $kernelPath '\powershell5\logo-32x32.png'), [System.Drawing.Imaging.ImageFormat]::Png)
 @"
 {
-  "argv": [
-    "$($installPath.replace('\','/'))/Jupyter_PowerShell5.exe",
-    "{connection_file}"
-  ],
-  "display_name": "PowerShell 5",
-  "language": "Powershell"
+    "argv": [
+        "$($installPath.replace('\','/'))/Jupyter_PowerShell5.exe",
+        "{connection_file}"
+    ],
+    "display_name": "PowerShell 5",
+    "language": "Powershell"
 }
 "@ | Set-Content -Path (Join-Path $kernelPath '\powershell5\kernel.json')
-    Move-Item -Path (Join-Path $installPath '*.png') -Destination (Join-Path $kernelPath '\powershell5\') -Force
-    if ($CleanupDownloadFiles) {
-        Remove-Item (Join-Path $WorkingFolder 'PowerShell5.zip') -Force
-    }
+Move-Item -Path (Join-Path $installPath '*.png') -Destination (Join-Path $kernelPath '\powershell5\') -Force -Verbose:$VerbosePreference
+if ($CleanupDownloadFiles) {
+    Remove-Item (Join-Path $WorkingFolder 'PowerShell5.zip') -Force -Verbose:$VerbosePreference
 }
+
 if ($InstallPwsh7SDK) {
     Write-Verbose 'Installing DeepAQ pwshSDK Kernel...'
     $installPath = Join-Path $packagePath 'powershellSDK_kernel'
-    Expand-Archive -Path (Join-Path $WorkingFolder 'PowerShellSDK.zip') -DestinationPath $installPath -Force
-    New-Item -ItemType Directory -Path (Join-Path $kernelPath '\powershellSDK\') -Force
-    Invoke-WebRequest -UseBasicParsing -Verbose -Uri 'https://raw.githubusercontent.com/PowerShell/PowerShell/master/assets/Powershell_black_64.png' -OutFile (Join-Path $kernelPath '\powershellSDK\logo-64x64.png')
+    Expand-Archive -Path (Join-Path $WorkingFolder 'PowerShellSDK.zip') -DestinationPath $installPath -Force -Verbose:$VerbosePreference
+    New-Item -ItemType Directory -Path (Join-Path $kernelPath '\powershellSDK\') -Force -Verbose:$VerbosePreference
+    Invoke-WebRequest -UseBasicParsing -Uri 'https://raw.githubusercontent.com/PowerShell/PowerShell/master/assets/Powershell_black_64.png' -OutFile (Join-Path $kernelPath '\powershellSDK\logo-64x64.png') -Verbose:$VerbosePreference
     Add-Type -AssemblyName System.Drawing
     $image = [System.Drawing.Image]::FromFile((Join-Path $kernelPath '\powershellSDK\logo-64x64.png'))
     $bitmap32 = New-Object System.Drawing.Bitmap(32, 32)
     [System.Drawing.Graphics]::FromImage($bitmap32).DrawImage($image, 0, 0, 32, 32)
     $bitmap32.Save((Join-Path $kernelPath '\powershellSDK\logo-32x32.png'), [System.Drawing.Imaging.ImageFormat]::Png)
 @"
 {
-  "argv": [
-    "$($installPath.replace('\','/'))/Jupyter_PowerShellSDK.exe",
-    "{connection_file}"
-  ],
-  "display_name": "PowerShell 7 (SDK)",
-  "language": "Powershell"
+    "argv": [
+        "$($installPath.replace('\','/'))/Jupyter_PowerShellSDK.exe",
+        "{connection_file}"
+    ],
+    "display_name": "PowerShell 7 (SDK)",
+    "language": "Powershell"
 }
 "@ | Set-Content -Path (Join-Path $kernelPath '\powershellSDK\kernel.json')
-    Move-Item -Path (Join-Path $installPath '*.png') -Destination (Join-Path $kernelPath '\powershellSDK\') -Force
+    Move-Item -Path (Join-Path $installPath '*.png') -Destination (Join-Path $kernelPath '\powershellSDK\') -Force -Verbose:$VerbosePreference
     if ($CleanupDownloadFiles) {
-        Remove-Item (Join-Path $WorkingFolder 'PowerShellSDK.zip') -Force
+        Remove-Item (Join-Path $WorkingFolder 'PowerShellSDK.zip') -Force -Verbose:$VerbosePreference
     }
 }
 
@@ -213,15 +177,15 @@ if ($InstallDotnetInteractive) {
     dotnet interactive jupyter install --path "$kernelPath"
     if ($CleanupDownloadFiles) {
         Start-Sleep -Seconds 5
-        Remove-Item 'dotnet.exe' -Force
+        Remove-Item 'dotnet.exe' -Force -Verbose:$VerbosePreference
     }
 }
 elseif ($InstallPwsh7SDK) {
     Write-Verbose 'Installing .NET Runtime...'
     Start-Process -FilePath (Join-Path $WorkingFolder 'dotnet.exe') -ArgumentList '/install /passive /norestart' -Wait
     if ($CleanupDownloadFiles) {
         Start-Sleep -Seconds 5
-        Remove-Item (Join-Path $WorkingFolder 'dotnet.exe') -Force
+        Remove-Item (Join-Path $WorkingFolder 'dotnet.exe') -Force -Verbose:$VerbosePreference
     }
 }
 
diff --git a/Miniconda/README-JP.md b/Miniconda/README-JP.md
@@ -3,13 +3,9 @@
 
 ## インストールするソフトウェア
 - [Miniconda](https://docs.conda.io/en/latest/miniconda.html)
-- [Jupyter-PowerShell5](https://github.com/DeepAQ/Jupyter-PowerShell5)
-- [Jupyter-PowerShellSDK](https://github.com/sakaztk/Jupyter-PowerShellSDK) (オプション)
-- [Jupyter Powershell Kernel](https://github.com/vors/jupyter-powershell) (オプション)
 - [Node.js](https://nodejs.org/) (Use in extentions for JupyterLab)
-- [PowerShell 7](https://github.com/PowerShell/PowerShell) (オプション)
-- [Jupyter Nbextensions](https://github.com/ipython-contrib/jupyter_contrib_nbextensions) (Optional)
-- [Jupyter Nbextensions Configurator](https://github.com/Jupyter-contrib/jupyter_nbextensions_configurator) (オプション)
+- [Jupyter-PowerShell5](https://github.com/sakaztk/Jupyter-PowerShellSDK/tree/powershellsdk/Jupyter-PowerShell5) ([DeepAQ](https://github.com/DeepAQ/Jupyter-PowerShell5)からフォーク)
+- [Jupyter-PowerShellSDK](https://github.com/sakaztk/Jupyter-PowerShellSDK) (オプション)
 - [.Net Interactive](https://github.com/dotnet/interactive) (オプション)
 
 ## インストール方法
@@ -22,19 +18,10 @@
 デフォルト: Computer  
 例: .\Miniconda.ps1 -InstallationType User
 
-- UsePipKernel  
-このスイッチオプションを指定すると、[Jupyter-PowerShell5](https://github.com/DeepAQ/Jupyter-PowerShell5)の代わりに[Jupyter Powershell Kernel](https://github.com/vors/jupyter-powershell)を使用します。  
-例: .\WinPython.ps1 -UsePipKernel
-
 - InstallPwsh7SDK  
 このスイッチオプションを指定すると、 [Jupyter-PowerShellSDK](https://github.com/sakaztk/Jupyter-PowerShellSDK)をインストールします。  
 例: .\Anaconda.ps1 -InstallPwsh7SDK
 
-- InstallNBExtensions  
-このスイッチオプションを指定すると、 [Jupyter Nbextensions](https://github.com/ipython-contrib/jupyter_contrib_nbextensions) と [Jupyter Nbextensions Configurator](https://github.com/Jupyter-contrib/jupyter_nbextensions_configurator)をインストールします。  
-[Note] インストールすることでJupyterLabのエクスポート機能が使えなくなる可能性があります。([*](https://github.com/jupyterlab/jupyterlab-desktop/issues/465))  
-例: .\Miniconda.ps1 -InstallNBExtensions
-
 - InstallDotnetInteractive  
 このスイッチオプションを指定すると、[.Net Interactive](https://github.com/dotnet/interactive)をインストールします。  
 例: .\Miniconda.ps1 -InstallDotnetInteractive
diff --git a/Miniconda/README.md b/Miniconda/README.md
