Merge branch 'next' of github.com:gnss-sdr/gnss-sdr into pps_lime

.github/workflows/main.yml

@@ -182,6 +182,16 @@ jobs:
       run: cd build && ctest -C Release --exclude-regex volk_gnsssdr_32fc_32f_rotator_dotprodxnpuppet_32fc
 
 
+  shellcheck:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: install dependencies
+      run: sudo apt install shellcheck
+    - name: check scripts
+      run: shellcheck src/utils/scripts/*
+
+
   REUSE-compliance:
     runs-on: ubuntu-latest
     steps:

src/core/libs/gnss_sdr_supl_client.cc

@@ -429,7 +429,7 @@ bool Gnss_Sdr_Supl_Client::load_gal_ephemeris_xml(const std::string& file_name)
 }
 
 
-bool save_gal_ephemeris_map_xml(const std::string& file_name, std::map<int, Galileo_Ephemeris> eph_map)
+bool Gnss_Sdr_Supl_Client::save_gal_ephemeris_map_xml(const std::string& file_name, std::map<int, Galileo_Ephemeris> eph_map)
 {
     if (eph_map.empty() == false)
         {
@@ -476,7 +476,7 @@ bool Gnss_Sdr_Supl_Client::load_cnav_ephemeris_xml(const std::string& file_name)
 }
 
 
-bool save_cnav_ephemeris_map_xml(const std::string& file_name, std::map<int, Gps_CNAV_Ephemeris> eph_map)
+bool Gnss_Sdr_Supl_Client::save_cnav_ephemeris_map_xml(const std::string& file_name, std::map<int, Gps_CNAV_Ephemeris> eph_map)
 {
     if (eph_map.empty() == false)
         {
@@ -510,9 +510,9 @@ bool Gnss_Sdr_Supl_Client::load_gnav_ephemeris_xml(const std::string& file_name)
         {
             ifs.open(file_name.c_str(), std::ifstream::binary | std::ifstream::in);
             boost::archive::xml_iarchive xml(ifs);
-            gps_cnav_ephemeris_map.clear();
+            glonass_gnav_ephemeris_map.clear();
             xml >> boost::serialization::make_nvp("GNSS-SDR_gnav_ephemeris_map", this->glonass_gnav_ephemeris_map);
-            LOG(INFO) << "Loaded GLONASS ephemeris map data with " << this->gps_cnav_ephemeris_map.size() << " satellites";
+            LOG(INFO) << "Loaded GLONASS ephemeris map data with " << this->glonass_gnav_ephemeris_map.size() << " satellites";
         }
     catch (std::exception& e)
         {
@@ -523,7 +523,7 @@ bool Gnss_Sdr_Supl_Client::load_gnav_ephemeris_xml(const std::string& file_name)
 }
 
 
-bool save_gnav_ephemeris_map_xml(const std::string& file_name, std::map<int, Glonass_Gnav_Ephemeris> eph_map)
+bool Gnss_Sdr_Supl_Client::save_gnav_ephemeris_map_xml(const std::string& file_name, std::map<int, Glonass_Gnav_Ephemeris> eph_map)
 {
     if (eph_map.empty() == false)
         {

src/core/libs/gnss_sdr_supl_client.h

@@ -122,7 +122,7 @@ public:
     /*!
      * \brief Save GPS CNAV ephemeris map to XML file.
      */
-    bool save_cnav_ephemeris_map_xml(const std::string file_name,
+    bool save_cnav_ephemeris_map_xml(const std::string& file_name,
         std::map<int, Gps_CNAV_Ephemeris> eph_map);
 
     /*!
@@ -133,7 +133,7 @@ public:
     /*!
      * \brief Save Galileo ephemeris map to XML file.
      */
-    bool save_gal_ephemeris_map_xml(const std::string file_name,
+    bool save_gal_ephemeris_map_xml(const std::string& file_name,
         std::map<int, Galileo_Ephemeris> eph_map);
 
     /*!
@@ -144,7 +144,7 @@ public:
     /*!
      * \brief Save GLONASS GNAV ephemeris map to XML file.
      */
-    bool save_gnav_ephemeris_map_xml(const std::string file_name,
+    bool save_gnav_ephemeris_map_xml(const std::string& file_name,
         std::map<int, Glonass_Gnav_Ephemeris> eph_map);
 
     /*!

src/utils/scripts/download-galileo-almanac.sh

@@ -35,16 +35,11 @@ help()
     echo "  ./download-galileo-almanac.sh -rd 2022-03-15 # Gets Galileo Almanac XML file for that day, stores it as gal_almanac.xml"
 }
 
-if (([ "$1" = "-h" ]) || ([ "$1" = "--help" ])) ; then
+if [ "$1" = "-h" ] || [ "$1" = "--help" ] ; then
     help
     exit 0
 fi
 
-RENAME=""
-if (([ "$1" = "-r" ]) || ([ "$1" = "--rename" ])) ; then
-    RENAME=" -O gal_almanac.xml "
-fi
-
 BASE_URL="https://www.gsc-europa.eu/sites/default/files/sites/all/files/"
 YEAR=$(date '+%Y')
 SPACING="-"
@@ -57,7 +52,7 @@ TERMINATION2=".xml"
 COUNTER=1
 MAX_COUNTER=7
 
-if (([ "$1" = "-d" ]) || ([ "$1" = "--date" ])) ; then
+if [ "$1" = "-d" ] || [ "$1" = "--date" ] ; then
     if wget "$BASE_URL$2$TERMINATION2" >/dev/null 2>&1 ; then
         echo "Downloaded latest Galileo almanac from $BASE_URL$2$TERMINATION2"
         exit 0
@@ -78,12 +73,16 @@ else
     echo "According to system time, today is $(date '+%Y-%m-%d'). Searching for the latest Galileo almanac ..."
 fi
 
+if [ "$1" = "-r" ] || [ "$1" = "--rename" ]; then
+    RENAME="yes"
+fi
+
 lowercase()
 {
     echo "$1" | sed "y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/"
 }
 
-OS=`lowercase \`uname\``
+OS=$(lowercase "$(uname)")
 
 date_before()
 {
@@ -96,16 +95,21 @@ date_before()
         MONTH=$(date -d "$COUNTER day ago" '+%m')
         DAY=$(date -d "$COUNTER day ago" '+%d')
     fi
-    COUNTER=$(($COUNTER+1))
+    COUNTER=$((COUNTER+1))
 }
 
+download_rename_file()
+{
+    [ "$RENAME" = "yes" ] && set -- -O gal_almanac.xml "$@"
+    wget "$@"
+}
 
 try_download()
 {
     while [ $COUNTER -le $MAX_COUNTER ]
     do
         url="$BASE_URL$YEAR$SPACING$MONTH$SPACING$DAY$TERMINATION2"
-        if wget $RENAME $url >/dev/null 2>&1 ; then
+        if download_rename_file "$url" >/dev/null 2>&1 ; then
         	echo "Downloaded latest Galileo almanac from $url"
             exit 0
         else
@@ -115,9 +119,8 @@ try_download()
     done
 }
 
-
 url="$BASE_URL$YEAR$SPACING$MONTH$SPACING$DAY$TERMINATION1"
-if wget $RENAME $url >/dev/null 2>&1 ; then
+if download_rename_file "$url" >/dev/null 2>&1 ; then
 	echo "Downloaded latest Galileo almanac from $url"
 else
     try_download

src/utils/scripts/gnss-sdr-harness.sh

@@ -5,10 +5,10 @@
 # SPDX-FileCopyrightText: Javier Arribas <javier.arribas(at)cttc.es>
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-echo $@
-$@
+echo "Executing" "$@"
+"$@"
 while [ $? -eq 42 ]
 do
- echo "restarting GNSS-SDR..."
- $@
+  echo "Restarting GNSS-SDR..."
+  "$@"
 done