Merge pull request #144 from szymonos/dev

Merge dev to main
szymonos · Nov 21, 2023 · f52f074 · f52f074
2 parents 9e3a28b + ac640a4
commit f52f074
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 14 deletions.
diff --git a/.assets/provision/install_azurecli.sh b/.assets/provision/install_azurecli.sh
@@ -42,10 +42,10 @@ unset __conda_setup
 # install azure-cli in dedicated environment
 if ! conda env list | grep -qw '^azurecli'; then
   if uname -r 2>&1 | grep -qw 'WSL2'; then
-    conda create --name azurecli --yes python=3.10 pip
+    conda create --name azurecli --yes python=3.11 pip
   else
     # https://github.com/conda/conda/issues/12051
-    conda create --name azurecli --yes python=3.10 pip numpy-base
+    conda create --name azurecli --yes python=3.11 pip numpy-base
   fi
 fi
 conda activate azurecli

diff --git a/wsl/wsl_setup.ps1 b/wsl/wsl_setup.ps1
@@ -203,19 +203,8 @@ begin {
                 wsl.exe --install --distribution $Distro --web-download
             }
         }
-        # *perform initial distro setup
+        # get installed distro details
         $lxss = Get-WslDistro -FromRegistry | Where-Object Name -EQ $Distro
-        # enable automount in wsl.conf
-        $param = @{
-            Distro   = $Distro
-            ConfDict = [ordered]@{
-                automount = [ordered]@{
-                    enabled    = 'true'
-                    mountFsTab = 'true'
-                }
-            }
-        }
-        Set-WslConf @param
     } elseif ($lxss) {
         Write-Host "Found $($lxss.Count) distro$($lxss.Count -eq 1 ? '' : 's') to update." -ForegroundColor White
         $lxss.Name.ForEach({ Write-Host "- $_" })