diff --git a/src/etc/wslusc-helper.sh b/src/etc/wslusc-helper.sh index 892be762..8c09e766 100644 --- a/src/etc/wslusc-helper.sh +++ b/src/etc/wslusc-helper.sh @@ -29,8 +29,10 @@ if [[ -n $WSL_INTEROP ]]; then fi if ( eval "$ipconfig_exec" | grep -n -m 1 "Default Gateway.*: [0-9a-z]" | cut -d : -f 1 ) >/dev/null; then + set +H wsl2_d_tmp="$(eval "$ipconfig_exec" | grep -n -m 1 "Default Gateway.*: [0-9a-z]" | cut -d : -f 1)" - wsl2_d_tmp="$(eval "$ipconfig_exec" | sed $(( $wsl2_d_tmp - 4 ))','$(( $wsl2_d_tmp + 0 ))'!d' | grep IPv4 | cut -d : -f 2 | sed -e "s|\s||g" -e "s|\r||g")" + wsl2_d_tmp="$(eval "$ipconfig_exec" | sed $(( wsl2_d_tmp - 4 ))','$(( wsl2_d_tmp + 0 ))'!d' | grep IPv4 | cut -d : -f 2 | sed -e "s|\s||g" -e "s|\r||g")" + set -H export DISPLAY=${wsl2_d_tmp}:0.0 else wsl2_d_tmp="$(grep nameserver /etc/resolv.conf | awk '{print $2}')" diff --git a/src/wslview.sh b/src/wslview.sh index f87ba017..9d06bdc9 100644 --- a/src/wslview.sh +++ b/src/wslview.sh @@ -41,7 +41,7 @@ if [[ "$lname" != "" ]]; then if [[ "$lname" =~ ^file:\/\/\/.* ]]; then wslutmpbuild=$("$(interop_prefix)$(sysdrive_prefix)"/Windows/System32/reg.exe query "HKLM\\Software\\Microsoft\\Windows NT\\CurrentVersion" /v CurrentBuild | tail -n 2 | head -n 1 | sed -e 's|\r||g') wslutmpbuild=${wslutmpbuild##* } - wslutmpbuild="$(( $wslutmpbuild + 0 ))" + wslutmpbuild="$(( wslutmpbuild + 0 ))" if [ $wslutmpbuild -ge $BN_MAY_NINETEEN ]; then # if Windows 10 is in version 1903 or later properfile_full_path="$(readlink -f "${lname//file:\/\//}")"