Fix GNOME installation and add an script for that

create-targz.sh

@@ -67,13 +67,16 @@ function build() {
   chmod +x "${TMPDIR}"/dist/usr/local/bin/upgrade.sh
   ln -s /usr/local/bin/upgrade.sh "${TMPDIR}"/dist/usr/local/bin/update.sh
 
+  cp "${origin_dir}"/linux_files/install-gnome-desktop.sh -o "${TMPDIR}"/dist/usr/local/bin/install-gnome-desktop.sh
+  chmod +x "${TMPDIR}"/dist/usr/local/bin/install-gnome-desktop.sh
+
   cp "${origin_dir}"/linux_files/start-systemd.sudoers "${TMPDIR}"/dist/etc/sudoers.d/start-systemd
   cp "${origin_dir}"/linux_files/start-systemd.sh "${TMPDIR}"/dist/usr/local/bin/start-systemd
   chmod +x "${TMPDIR}"/dist/usr/local/bin/start-systemd
 
- # cp "${origin_dir}"/linux_files/wsl2-xwayland.service "${TMPDIR}"/dist/etc/systemd/system/wsl2-xwayland.service
- # cp "${origin_dir}"/linux_files/wsl2-xwayland.socket "${TMPDIR}"/dist/etc/systemd/system/wsl2-xwayland.socket
- # ln -sf ../wsl2-xwayland.socket "${TMPDIR}"/dist/etc/systemd/system/sockets.target.wants/
+ cp "${origin_dir}"/linux_files/wsl2-xwayland.service "${TMPDIR}"/dist/etc/systemd/system/wsl2-xwayland.service
+ cp "${origin_dir}"/linux_files/wsl2-xwayland.socket "${TMPDIR}"/dist/etc/systemd/system/wsl2-xwayland.socket
+ ln -sf ../wsl2-xwayland.socket "${TMPDIR}"/dist/etc/systemd/system/sockets.target.wants/
 
   cp "${origin_dir}"/linux_files/systemctl3.py "${TMPDIR}"/dist/usr/local/bin/wslsystemctl
   chmod +x "${TMPDIR}"/dist/usr/local/bin/wslsystemctl

linux_files/00-remix.sh

@@ -38,6 +38,9 @@ setup_display() {
       setup_interop
     fi
 
+    unset WAYLAND_DISPLAY
+    rm -f /mnt/wslg/runtime-dir/wayland*
+
     return
   fi
 

linux_files/install-gnome-desktop.sh

@@ -0,0 +1,20 @@
+#! /bin/bash
+#
+
+[ "$(grep -c "^systemd.*" /etc/wsl.conf)" -eq 0 ] && echo -e "\n[boot]\nsystemd=true\n" | sudo tee -a /etc/wsl.conf
+[ "$(grep -c "^systemd.*=.*true$" /etc/wsl.conf)" -eq 0 ] && sudo sed -i "s/^systemd.*=.*false$/systemd=true/" /etc/wsl.conf
+
+[ "$(grep -c "^hostname.*" /etc/wsl.conf)" -eq 0 ] && sudo sed '/\[network\]/s/.*/&\nhostname=fedoraremix/' /etc/wsl.conf
+
+update.sh
+
+sudo dnf -y group install 'GNOME'
+
+sudo localectl set-locale LANG="en_US.UTF-8"
+
+sudo dnf -y install xrdp
+sudo systemctl enable xrdp
+sudo sed -i "s/port=3389/port=3396/" /etc/xrdp/xrdp.ini
+sudo sed -i "s/ListenPort=3350/ListenPort=3346/" /etc/xrdp/sesman.ini
+
+wsl.exe --terminate ${WSL_DISTRO_NAME}

linux_files/upgrade.sh

@@ -42,6 +42,10 @@ sudo chmod -x,+r /etc/profile.d/00-remix.sh
 # Add local.conf to fonts
 sudo curl -L -f "${base_url}/linux_files/local.conf" -o /etc/fonts/local.conf
 
+# Install additional scripts
+sudo curl -L -f "${base_url}/linux_files/install-gnome-desktop.sh" -o /usr/local/bin/install-gnome-desktop.sh
+chmod +x /usr/local/bin/install-gnome-desktop.sh
+
 # Install mesa
 source /etc/os-release