From 0cec5dccead8a4a7099d6cd1c96d23454c23922f Mon Sep 17 00:00:00 2001 From: Oleksandr Shcherbatii Date: Sun, 24 Apr 2022 07:34:39 +0000 Subject: [PATCH] Tools: Fix setup for Jammy --- Tools/scripts/build-jsbsim.sh | 2 +- Tools/vagrant/initvagrant-desktop.sh | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Tools/scripts/build-jsbsim.sh b/Tools/scripts/build-jsbsim.sh index a6ba075a1f..9e84927015 100755 --- a/Tools/scripts/build-jsbsim.sh +++ b/Tools/scripts/build-jsbsim.sh @@ -13,7 +13,7 @@ else echo "$JSBBINARY does not exist, building it in your home folder:" cd ~ rm -rf jsbsim - git clone git://github.com/JSBSim-Team/jsbsim.git + git clone https://github.com/JSBSim-Team/jsbsim.git cd jsbsim mkdir build cd build diff --git a/Tools/vagrant/initvagrant-desktop.sh b/Tools/vagrant/initvagrant-desktop.sh index b21df34ee3..09067a821f 100644 --- a/Tools/vagrant/initvagrant-desktop.sh +++ b/Tools/vagrant/initvagrant-desktop.sh @@ -14,7 +14,14 @@ fi apt-get update -apt-get install -y ubuntu-desktop +RELEASE_CODENAME=$(lsb_release -c -s) + +PACKAGES="ubuntu-desktop" +if [ ${RELEASE_CODENAME} == 'jammy' ]; then + PACKAGES="$PACKAGES dbus-x11" +fi + +apt-get install -y $PACKAGES GDB_CONF="/etc/gdm3/custom.conf" perl -pe 's/# AutomaticLoginEnable = true/AutomaticLoginEnable = true/' -i "$GDB_CONF"