Merge pull request #361 from WhitewaterFoundry/development

Development
WhitewaterFoundry · Jan 24, 2022 · 3c9375e · 3c9375e
2 parents d2f94da + 8e434a8
commit 3c9375e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/pengwin-setup.d/azurecli.sh b/pengwin-setup.d/azurecli.sh
@@ -9,10 +9,10 @@ if (confirm --title "AZURECLI" --yesno "Would you like to download and install A
   curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor >microsoft.gpg
   sudo cp microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg
   sudo chmod 644 /etc/apt/trusted.gpg.d/microsoft.gpg
-  sudo bash -c "echo 'deb https://packages.microsoft.com/repos/azure-cli/ buster main' > /etc/apt/sources.list.d/azurecli.list"
+  sudo bash -c "echo 'deb https://packages.microsoft.com/repos/azure-cli/ bullseye main' > /etc/apt/sources.list.d/azurecli.list"
   sudo apt-get -y -q update
 
-  install_packages -t buster azure-cli jq
+  install_packages -t bullseye azure-cli jq
   cleantmp
 else
   echo "Skipping AZURECLI"

diff --git a/pengwin-setup.d/powershell.sh b/pengwin-setup.d/powershell.sh
@@ -11,7 +11,7 @@ if (confirm --title "POWERSHELL" --yesno "Would you like to download and install
   curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor >microsoft.gpg
   sudo cp microsoft.gpg /etc/apt/trusted.gpg.d/microsoft.gpg
 
-  sudo sh -c 'echo "deb https://packages.microsoft.com/repos/microsoft-debian-buster-prod buster main" > /etc/apt/sources.list.d/microsoft.list'
+  sudo sh -c 'echo "deb https://packages.microsoft.com/repos/microsoft-debian-bullseye-prod bullseye main" > /etc/apt/sources.list.d/microsoft.list'
 
   update_packages
   install_packages powershell

diff --git a/pengwin-setup.d/vcxsrv.sh b/pengwin-setup.d/vcxsrv.sh
@@ -44,17 +44,19 @@ if (confirm --title "VCXSRV" --yesno "Would you like to install the VcXsrv X-ser
   sudo bash -c 'cat > /etc/profile.d/01-vcxsrv.sh' <<EOF
 #!/bin/sh
 
-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 &)
-else
-  (cmd.exe /V /C "set __COMPAT_LAYER=HighDpiAware&& ${wVcxsrvDir}\vcxsrv.exe" :0 -silent-dup-error -multiwindow -nowgl >/dev/null 2>&1 &)
+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 &)
+  else
+    (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
 
 export XRANDRDPI=\$(timeout 2s xdpyinfo | grep resolution | sed "s/.*resolution:[ ]*\([0-9]*\)x.*/\1/")
 export VCXSRV=yes
 
 EOF
-  #add_fish_support '01-vcxsrv'
 
   unset version
   unset VcxsrvUrl
@@ -63,6 +65,8 @@ EOF
 
   # Avoid collision with the other XServer
   sudo rm -f /etc/profile.d/02-x410.sh
+
+  #add_fish_support '01-vcxsrv'
   sudo rm -f "${__fish_sysconf_dir:=/etc/fish/conf.d}/02-x410.fish"
 
   source /etc/profile.d/01-vcxsrv.sh