fix #418

Author: Stefal

CHANGELOG.md

@@ -3,9 +3,11 @@
 ## [2.6.1] - not released
 ### Added
 ### Changed
+ - More tests before installing prebuilt RTKLib cli tools.
 ### Deprecated
 ### Removed
 ### Fixed
+ - Build rtklib if previous installed release is not working. #418
  - Insert new release into settings.conf before restarting services. #411
  - Custom web_port setting was not used. #419
  - Cellular modem: nmcli connection was not updated after a switch to public ip address.

settings.conf.default

@@ -2,7 +2,7 @@
 
 [general]
 # Version
-version=2.6.0
+version=2.6.1
 # Rtkbase upgrade mandatory "checkpoint"
 checkpoint_version=2.7.0
 # User who runs str2str_file service

tools/install.sh

@@ -167,7 +167,8 @@ install_rtklib() {
     #test if computer_model in sbc_array (https://stackoverflow.com/questions/3685970/check-if-a-bash-array-contains-a-value)
     if printf '%s\0' "${sbc_array[@]}" | grep -Fxqz -- "${computer_model}" \
         && [[ -f "${rtkbase_path}"'/tools/bin/rtklib_b34j/'"${arch_package}"'/str2str' ]] \
-        && lsb_release -c | grep -qE 'buster|bullseye|bookworm'
+        && lsb_release -c | grep -qE 'bullseye|bookworm' \
+        && "${rtkbase_path}"'/tools/bin/rtklib_b34j/'"${arch_package}"/str2str --version > /dev/null 2>&1
     then
       echo 'Copying new rtklib binary for ' "${computer_model}" ' - ' "${arch_package}"
       cp "${rtkbase_path}"'/tools/bin/rtklib_b34j/'"${arch_package}"/str2str /usr/local/bin/

tools/rtkbase_update.sh

@@ -200,7 +200,10 @@ upd_2.5.0 () {
 }
 
 upd_2.6.0() {
+  # update modem_check_service file (see https://github.com/Stefal/rtkbase/commit/cfad1981e483d74da04f53b8d7b354661100d610)
   "${destination_directory}"/tools/install.sh --user "${standard_user}" --unit-files
+  # build rtklib if current release doesn't work
+  "${destination_directory}"/tools/install.sh --user "${standard_user}" --rtklib
 }
 
 #check if we can apply the update