Echo commands in install software script

.github/workflows/main.yml

@@ -0,0 +1,22 @@
+name: Build image
+
+on:
+  push:
+    branches: [ '*' ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: macos-10.15
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup
+        run: |
+          set -x
+          mkdir output-virtualbox-iso
+          pushd output-virtualbox-iso
+          wget --progress=dot:giga https://github.com/sfalexrog/clever_vm/releases/download/v0.1_base_vm/clover-devel.ova
+          popd
+      - name: Build
+        run: ./build.sh

assets/desktop/code_ros.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=VS Code + ROS
+Name=VS Code
 Comment=Code Editing. Redefined.
 GenericName=Text Editor
 Exec=/bin/bash -c "source /home/clover/catkin_ws/devel/setup.bash; /usr/share/code/code --no-sandbox --unity-launch %F"

assets/desktop/jMAVSim Clover.desktop

@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=jMAVSim + Clover
+Comment=A lightweight PX4 simulator + Clover services
+Exec=/bin/bash -c 'source /home/clover/catkin_ws/devel/setup.bash; roslaunch clover_simulation simulator.launch type:=jmavsim'
+Icon=openjdk-8
+Path=
+Terminal=true
+StartupNotify=false

assets/patches/sitl_gazebo.patch

@@ -25,6 +25,25 @@ index 050558f..7029199 100644
      _send_mavlink_message(&msg, srcaddr);
  }
  
+@@ -591,6 +592,7 @@ void GeotaggedImagesPlugin::_handle_storage_info(const mavlink_message_t *pMsg,
+     float total_mib     = 0.0f;
+     float available_mib = 0.0f;
+     boost::filesystem::space_info si = boost::filesystem::space(".");
++    const std::string storage_name = "SITL Camera Storage";
+     available_mib = (float)((double)si.available / (1024.0 * 1024.0));
+     total_mib     = (float)((double)si.capacity  / (1024.0 * 1024.0));
+     _send_cmd_ack(pMsg->sysid, pMsg->compid, MAV_CMD_REQUEST_STORAGE_INFORMATION, MAV_RESULT_ACCEPTED, srcaddr);
+@@ -608,7 +610,9 @@ void GeotaggedImagesPlugin::_handle_storage_info(const mavlink_message_t *pMsg,
+         total_mib - available_mib,          // used_capacity,
+         available_mib,
+         NAN,                                // read_speed,
+-        NAN                                 // write_speed
++        NAN,                                // write_speed
++        STORAGE_TYPE_OTHER,                 // storage type
++        storage_name.c_str()                // storage name
+     );
+     _send_mavlink_message(&msg, srcaddr);
+ }
 diff --git a/src/gazebo_mavlink_interface.cpp b/src/gazebo_mavlink_interface.cpp
 index 5d29017..d4dd6a7 100644
 --- a/src/gazebo_mavlink_interface.cpp

build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -ex
 
 # FIXME: Use system Packer if possible
 #PACKER=$(which packer)
@@ -9,9 +9,14 @@ set -e
 PACKER="./packer"
 if [ ! -f ${PACKER} ]; then
     echo "Packer not found; downloading v1.5.4 from Hashicorp"
-    wget --progress=dot:giga https://releases.hashicorp.com/packer/1.5.4/packer_1.5.4_linux_amd64.zip
-    unzip packer_1.5.4_linux_amd64.zip
-    rm packer_1.5.4_linux_amd64.zip
+    if [[ "$OSTYPE" == "linux-gnu"* ]]; then
+        OS=linux
+    elif [[ "$OSTYPE" == "darwin"* ]]; then
+        OS=darwin
+    fi
+    wget --progress=dot:giga https://releases.hashicorp.com/packer/1.5.4/packer_1.5.4_${OS}_amd64.zip
+    unzip packer_1.5.4_${OS}_amd64.zip
+    rm packer_1.5.4_${OS}_amd64.zip
 fi
 
 echo "--- Using Packer version $(${PACKER} --version)"

scripts/installSoftware.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -e
+set -ex
 
 echo "--- Current environment:"
 /usr/bin/env