Merge pull request #375 from WhitewaterFoundry/development

Default X410 to the DNS IP and VcXsrv to the gateway IP

pengwin-setup.d/vcxsrv.sh

@@ -19,7 +19,7 @@ if (confirm --title "VCXSRV" --yesno "Would you like to install the VcXsrv X-ser
 
   wVcxsrvDir="$(cmd-exe /C "echo %USERPROFILE%\.vcxsrv" | tr -d '\r')"
   VcxsrvDir="$(wslpath "${wVcxsrvDir}")"
-  
+
   if [[ -d "${VcxsrvDir}" ]]; then
     echo "Uninstalling previous version"
     if cmd-exe /C tasklist | grep -Fq 'vcxsrv.exe'; then
@@ -30,7 +30,7 @@ if (confirm --title "VCXSRV" --yesno "Would you like to install the VcXsrv X-ser
     # now safe to delete
     rm -rf "${VcxsrvDir}"
   fi
-  
+
   echo "Creating vcxsrv install directory: $VcxsrvDir"
   mkdir -p "${VcxsrvDir}"
 
@@ -63,14 +63,17 @@ EOF
   unset wVcxsrvDir
   unset VcxsrvDir
 
+  #Make sure that DISPLAY points to the gateway IP address
+  rm -f "${HOME}/.config/pengwin/display_ip_from_dns"
+
   # 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
-  
+
   touch "${HOME}"/.should-restart
 else
   echo "Skipping VcxSrv"

pengwin-setup.d/x410.sh

@@ -10,17 +10,17 @@ if [ -x "$(command -v x410.exe)" ]; then
     sudo bash -c 'cat > /etc/profile.d/02-x410.sh' << EOF
 #!/bin/sh
 
-if [ -n "\${WSL2}" ]; then
-  (cmd-exe /c x410.exe /wm /public &> /dev/null &)
-else
-  (cmd-exe /c x410.exe /wm &> /dev/null &)
-fi
+(cmd-exe /c x410.exe /wm &> /dev/null &)
 
 export X410=yes
 
 EOF
     #add_fish_support '02-x410'
 
+    #Make sure that DISPLAY points to the internal IP address
+    mkdir -p "${HOME}/.config/pengwin"
+    touch "${HOME}/.config/pengwin/display_ip_from_dns"
+
     # Avoid collision with the other XServer
     sudo rm -f /etc/profile.d/01-vcxsrv.sh
     sudo rm -f "${__fish_sysconf_dir:=/etc/fish/conf.d}/01-vcxsrv.fish"