build ZXBox from Ubuntu 20.04 desktop

Author: reefactor

Vagrantfile

@@ -2,11 +2,13 @@
 # vi: set ft=ruby :
 
 # https://app.vagrantup.com/boxes/search
-vmbox_image = ENV["VMBOX_IMAGE"] || "generic/ubuntu2004"
+# "generic/ubuntu2004"
+# "peru/ubuntu-20.04-desktop-amd64"
+vmbox_image = ENV["VMBOX_IMAGE"] || "fasmat/ubuntu2004-desktop"
 
 
 # Check required vagrant dependencies plugins and install them
-required_plugins = %w( vagrant-reload vagrant-disksize vagrant-reload )
+required_plugins = %w( vagrant-reload vagrant-disksize vagrant-reload vagrant-vbguest)
 plugins_to_install = required_plugins.select { |plugin| not Vagrant.has_plugin? plugin }
 if not plugins_to_install.empty?
   puts "Installing plugins: #{plugins_to_install.join(' ')}"
@@ -33,11 +35,14 @@ Vagrant.configure("2") do |config|
   # set defaults for VMs
   config.vm.provider 'virtualbox' do |vb|
 
-    vb.name = "zx-spectrum-instapack-vbox"
+    vb.name = "zxbox"
 
     # enable native GUI window
     vb.gui = true
 
+    # enable RDP GUI access
+    vb.customize ["modifyvm", :id, "--vrde", "on", "--vrdemulticon", "on", "--vrdeport", "3389"]
+
     # hardware specs
     vb.customize ["modifyvm", :id, "--cpus", 2]
     vb.customize ["modifyvm", :id, "--memory", 3000]
@@ -47,10 +52,16 @@ Vagrant.configure("2") do |config|
     vb.customize ['modifyvm', :id, "--natdnshostresolver1", "off"]
 
     # enable audio (none|dsound|oss|alsa|pulse|coreaudio: supported audio types depends on the host OS)
-    vb.customize ["modifyvm", :id, "--audio", "pulse", "--audioout", "on", "--audiocontroller", "ac97"]
-
-    # enable RDP GUI access
-    vb.customize ["modifyvm", :id, "--vrde", "on", "--vrdemulticon", "on", "--vrdeport", "3389"]
+    vb.customize ["modifyvm", :id, "--audioout", "on"]
+    if RUBY_PLATFORM =~ /darwin/
+      vb.customize ["modifyvm", :id, '--audio', 'coreaudio']
+    elsif RUBY_PLATFORM =~ /mingw|mswin|bccwin|cygwin|emx/
+      vb.customize ["modifyvm", :id, '--audio', 'dsound']
+    elsif RUBY_PLATFORM =~ /linux/
+      vb.customize ["modifyvm", :id, '--audio', 'alsa']
+    end
+
+    # virtualbox.customize ["modifyvm", :id, "--clipboard-mode", "bidirectional"]
 
     # solve issue 'stuck connection timeout retrying' (kernel selection menu)
     # https://stackoverflow.com/questions/22575261/vagrant-stuck-connection-timeout-retrying

build_zxbox.sh

@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 # build Virtualbox VM (see Vagrantfile)
-# Usage:
-#   ./build_zxbox.sh
-#
+
 set -xe
 SCRIPTDIR=$(cd `dirname $0` && pwd)
 pushd $SCRIPTDIR
@@ -24,4 +22,10 @@ ssh $TARGETHOST "rm -rf ~/instapack"
 scp -rp $SCRIPTDIR $TARGETHOST:~/instapack
 set +e
 ssh $TARGETHOST "sudo bash ~/instapack/install_zxbox_ubuntu2004.sh"
-set -e
+
+if [ -e $FROM_UBUNTUS_ERVER ]; then
+  sleep 30
+  # reboot again for autologin
+  ssh $TARGETHOST "sudo reboot"
+  set -e
+fi

install_zxbox_ubuntu2004.sh

@@ -2,7 +2,6 @@
 SCRIPTDIR=$(cd `dirname $0` && pwd)
 
 apt-get update
-apt-get install -y xinit
 
 # enable autologin
 mv /etc/gdm3/custom.conf /etc/gdm3/custom.conf.bak
@@ -12,6 +11,7 @@ echo "AutomaticLogin = vagrant" >> /etc/gdm3/custom.conf
 
 
 apt-get install -y dosbox wine libgles2-mesa
+dpkg --add-architecture i386 && sudo apt-get update && sudo apt-get install wine32
 
 apt-get install -y fuse-emulator-sdl
 
@@ -20,6 +20,20 @@ apt-get install -y fuse-emulator-sdl
 mv $SCRIPTDIR/emul/usp $SCRIPTDIR/emul/usp.old
 bash $SCRIPTDIR/emul/build_usp_debian-ubuntu.sh
 
-
-# after install xinit boot into gui logon
-reboot
+# create shortcuts to lunch emulators
+ln -s $SCRIPTDIR /home/vagrant/Desktop
+cp $SCRIPTDIR/usp.desktop /home/vagrant/Desktop/
+
+
+if [ -e $FROM_UBUNTUS_ERVER ]; then
+  # make ubuntu desktop from ubuntu server
+  apt-get install -y xinit
+  apt-get install -y gnome-panel gnome-tweaks
+  # add Nemo default file manager in Ubuntu
+  apt-get install -y nemo
+  xdg-mime default nemo.desktop inode/directory application/x-gnome-saved-search
+  gsettings set org.gnome.desktop.background show-desktop-icons false
+  gsettings set org.nemo.desktop show-desktop-icons true
+  # after install xinit boot into gui logon
+  reboot
+fi

usp.desktop

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Terminal=true
+Name=USP
+#Icon=
+Exec=/home/vagrant/instapack/linux-usp.sh
+
+