Fix

assets/desktop/Clover Drone Kit Tools.desktop

@@ -1,7 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Link
-Name=Clover Drone Kit Tools
-Comment=Open web based Clover tools
-Icon=user-bookmarks
-URL=http://localhost/

assets/desktop/Gazebo PX4.desktop

@@ -1,8 +1,8 @@
 [Desktop Entry]
 Version=1.0
 Type=Application
-Name=Gazebo Clover
-Comment=Run Clover drone simulation in Gazebo
+Name=Gazebo PX4
+Comment=Fully-featured Gazebo simulation with default PX4 settings
 Exec=/bin/bash -c 'source /home/clover/catkin_ws/devel/setup.bash; roslaunch clover_simulation simulator.launch'
 Icon=gazebo
 Path=

scripts/install_software.sh

@@ -35,7 +35,6 @@ git clone --recursive --depth 1 --branch v1.12.0 https://github.com/PX4/PX4-Auto
 # PX4 v1.11.1 script will happily run sudo by itself
 ${HOME}/PX4-Autopilot/Tools/setup/ubuntu.sh
 # Ubuntu 20.04 no longer sets assistive_technologies, thankfully
-sudo -E sh -c 'apt-get install -y ant openjdk-11-jdk' # Additional packages for jMAVSim
 
 echo "--- Prebuilding PX4 SITL configuration"
 make -C ${HOME}/PX4-Autopilot px4_sitl
@@ -93,10 +92,10 @@ EOF'
 sudo apt-get update
 rosdep update
 mkdir -p ${HOME}/catkin_ws/src
-git clone --depth 1 https://github.com/CopterExpress/clover ${HOME}/catkin_ws/src/clover
-git clone --depth 1 https://github.com/CopterExpress/ros_led ${HOME}/catkin_ws/src/ros_led
+git clone https://github.com/CopterExpress/clover ${HOME}/catkin_ws/src/clover
+git clone https://github.com/CopterExpress/ros_led ${HOME}/catkin_ws/src/ros_led
 # These packages are missing from Noetic release, but are required for sitl_gazebo
-git clone --depth 1 https://github.com/ethz-asl/mav_comm ${HOME}/catkin_ws/src/mav_comm
+git clone https://github.com/ethz-asl/mav_comm ${HOME}/catkin_ws/src/mav_comm
 # Make PX4 and Gazebo plugins visible in the workspace
 ln -s ${HOME}/PX4-Autopilot ${HOME}/catkin_ws/src/PX4-Autopilot
 ln -s ${HOME}/PX4-Autopilot/Tools/sitl_gazebo ${HOME}/catkin_ws/src/sitl_gazebo
@@ -110,7 +109,7 @@ echo "source ${HOME}/catkin_ws/devel/setup.bash" >> ~/.bashrc
 source $HOME/catkin_ws/devel/setup.bash
 
 echo "--- Adding Clover vehicle startup script to PX4"
-ln -s "$(catkin_find clover_simulation airframes)"/* $HOME/PX4-Autopilot/ROMFS/px4fmu_common/init.d-posix/airframes/
+ln -s "$(catkin_find clover_simulation airframes)/*" $HOME/PX4-Autopilot/ROMFS/px4fmu_common/init.d-posix/airframes/
 
 echo "--- Installing npm"
 cd ${HOME}
@@ -152,7 +151,6 @@ sudo -E sh -c 'apt-get update; apt-get install -y firefox'
 echo "--- Installing Monkey web server"
 sudo apt-get install -y /tmp/packages/monkey_1.6.9-1_amd64.deb
 sed "s/pi/${USER}/g" ${HOME}/catkin_ws/src/clover/builder/assets/monkey | sudo tee /etc/monkey/sites/default
-sudo -E sh -c "sed -i 's/SymLink Off/SymLink On/' /etc/monkey/monkey.conf"
 sudo cp ${HOME}/catkin_ws/src/clover/builder/assets/monkey.service /etc/systemd/system/monkey.service
 sudo systemctl enable monkey
 
@@ -204,7 +202,3 @@ rosversion nodelet
 
 echo "Trying running the Gazebo simulator, check the output"
 timeout --preserve-status 30 roslaunch clover_simulation simulator.launch gui:=false --screen
-
-echo "Trying running jMAVSim, check the output"
-cd ~/PX4-Autopilot
-HEADLESS=1 timeout --preserve-status 30 make px4_sitl jmavsim