Merge pull request #363 from WhitewaterFoundry/development

Development
WhitewaterFoundry · Jan 28, 2022 · ac31e44 · ac31e44
2 parents 3c9375e + 3dd78e2
commit ac31e44
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/pengwin-setup.d/pythonpi.sh b/pengwin-setup.d/pythonpi.sh
@@ -45,8 +45,8 @@ function install_pyenv() {
     eval "$(pyenv init --path)"
     eval "$(pyenv init -)"
 
-    pyenv install -s 3.10.1
-    pyenv global 3.10.1
+    pyenv install -s 3.10.2
+    pyenv global 3.10.2
 
     touch "${HOME}"/.should-restart
 

diff --git a/pengwin-setup.d/terminal.sh b/pengwin-setup.d/terminal.sh
@@ -59,7 +59,7 @@ function main() {
       tmp_f="$(pwd)"
       # shellcheck disable=SC2164
       cd "${wHome}/Pengwin/.wsltty"
-      cmd.exe /C "install.bat"
+      cmd-exe /C "install.bat"
       # shellcheck disable=SC2164
       cd "$tmp_f"
       unset tmp_f

diff --git a/pengwin-setup.d/vcxsrv.sh b/pengwin-setup.d/vcxsrv.sh
@@ -46,9 +46,9 @@ if (confirm --title "VCXSRV" --yesno "Would you like to install the VcXsrv X-ser
 
 if ! cmd-exe /C tasklist | grep -Fq 'vcxsrv.exe'; then
   if [ -n "\${WSL2}" ]; then
-    (cmd.exe /V /C "set __COMPAT_LAYER=HighDpiAware&& ${wVcxsrvDir}\vcxsrv.exe" :0 -silent-dup-error -multiwindow -nowgl -ac >/dev/null 2>&1 &)
+    (cmd-exe /V /C "set __COMPAT_LAYER=HighDpiAware&& ${wVcxsrvDir}\vcxsrv.exe" :0 -silent-dup-error -multiwindow -nowgl -ac >/dev/null 2>&1 &)
   else
-    (cmd.exe /V /C "set __COMPAT_LAYER=HighDpiAware&& ${wVcxsrvDir}\vcxsrv.exe" :0 -silent-dup-error -multiwindow -nowgl >/dev/null 2>&1 &)
+    (cmd-exe /V /C "set __COMPAT_LAYER=HighDpiAware&& ${wVcxsrvDir}\vcxsrv.exe" :0 -silent-dup-error -multiwindow -nowgl >/dev/null 2>&1 &)
   fi
   sleep 1 # Wait for the server to start
 fi