Fix apt update not being run before installing apt packages dependencies

Author: kizniche

CHANGELOG.md

@@ -31,6 +31,7 @@ sudo service mycodoflask restart
 
  - Fix inability to set the same output for PID raise and lower ([#1369](https://github.com/kizniche/Mycodo/issues/1369))
  - Fix OpenWeather One Call API endpoint to use v3.0 ([#1429](https://github.com/kizniche/Mycodo/pull/1429))
+ - Fix apt update not being run before installing apt packages dependencies
 
 ### Features
 
@@ -3720,7 +3721,7 @@ If you rely on your system to work, it is highly recommended that you ***DO NOT
 
 #### Failure during the upgrade to >= 5.5.0
 
-I found that occasionally the upgrade will spontaneously stop without an indication of the issue. I've seen it happen during an apt-get install and during a pip upgrade. It does not seem consistent, and there were no erorrs, therefore it wasn't able to be fixed. If you experience an error during the upgrade that doesn't allow the upgrade to complete, issue the following commands to attempt to resume and complete the upgrade. If that doesn't fix it, you may have to install Mycodo from scratch.
+I found that occasionally the upgrade will spontaneously stop without an indication of the issue. I've seen it happen during an apt install and during a pip upgrade. It does not seem consistent, and there were no erorrs, therefore it wasn't able to be fixed. If you experience an error during the upgrade that doesn't allow the upgrade to complete, issue the following commands to attempt to resume and complete the upgrade. If that doesn't fix it, you may have to install Mycodo from scratch.
 
 ```bash
 sudo dpkg --configure -a

docker/README.md

@@ -101,7 +101,7 @@ Open a terminal in Raspbian and run the following commands.
 #### Retrieve and extract the latest Mycodo release
 
 ```shell script
-sudo apt-get install git
+sudo apt install git
 git clone https://github.com/kizniche/Mycodo
 ```
 

mycodo/mycodo_flask/api/dependency.py

@@ -1,24 +1,15 @@
 # coding=utf-8
-import flask_login
 import logging
 import threading
 import traceback
+
+import flask_login
 from flask_accept import accept
 from flask_restx import Resource
 from flask_restx import abort
-from flask_restx import fields
-
-from mycodo.databases.models import DeviceMeasurements
-from mycodo.databases.models import Input
-from mycodo.databases.models import InputChannel
-from mycodo.databases.models.input import InputChannelSchema
-from mycodo.databases.models.input import InputSchema
-from mycodo.databases.models.measurement import DeviceMeasurementsSchema
-from mycodo.mycodo_client import DaemonControl
+
 from mycodo.mycodo_flask.api import api
 from mycodo.mycodo_flask.api import default_responses
-from mycodo.mycodo_flask.api.utils import get_from_db
-from mycodo.mycodo_flask.api.utils import return_list_of_dictionaries
 from mycodo.mycodo_flask.routes_admin import install_dependencies
 from mycodo.mycodo_flask.utils import utils_general
 from mycodo.mycodo_flask.utils.utils_general import return_dependencies

mycodo/mycodo_flask/routes_admin.py

@@ -171,13 +171,24 @@ def get_all_file_paths(directory):
 def install_dependencies(dependencies):
     now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
     dependency_list = []
+    apt_update = False
+
     for each_dependency in dependencies:
+        if each_dependency[2] == 'apt':
+            apt_update = True
+
         if each_dependency[0] not in dependency_list:
             dependency_list.append(each_dependency[0])
+
     with open(DEPENDENCY_LOG_FILE, 'a+') as f:
         f.write("\n[{time}] Dependency installation beginning. Installing: {deps}\n\n".format(
             time=now, deps=", ".join(dependency_list)))
 
+    # Update apt repositories before installing apt dependencies
+    if apt_update:
+        cmd = f"/bin/bash {INSTALL_DIRECTORY}/mycodo/scripts/upgrade_commands.sh update-apt | ts '[%Y-%m-%d %H:%M:%S]' >> {DEPENDENCY_LOG_FILE} 2>&1"
+        cmd_output(cmd, stdout_pipe=False, user='root')
+
     for each_dep in dependencies:
         if each_dep[2] == 'bash-commands':
             for each_command in each_dep[1]:

mycodo/mycodo_flask/utils/utils_settings.py

@@ -1945,7 +1945,7 @@ def settings_diagnostic_recreate_influxdb_db_2():
             p = subprocess.Popen(command, shell=True)
             p.communicate()
         except Exception:
-            logger.exception()
+            logger.exception("recreating influxdb2x database")
 
     flash_success_errors(
         error, action, url_for('routes_settings.settings_diagnostic'))

mycodo/scripts/dependencies.sh

@@ -18,7 +18,7 @@ printf "\n#### Installing/updating %s (%s)\n" "${2}" "${1}"
 
 case "${1}" in
     'apt')
-        apt-get install -y "${2}"
+        apt install -y "${2}"
     ;;
     'pip-pypi')
         if [ ! -e "${INSTALL_DIRECTORY}"/env/bin/python3 ]; then

mycodo/scripts/raspi-monitor.sh

@@ -11,8 +11,8 @@
 # Script to enable and disable the HDMI signal of the Raspberry PI
 # Inspiration: http://www.raspberrypi.org/forums/viewtopic.php?t=16472&p=176258
 #
-# sudo apt-get update
-# sudo apt-get install git gcc libusb-dev
+# sudo apt update
+# sudo apt install git gcc libusb-dev
 # git clone https://github.com/codazoda/hub-ctrl.c
 # gcc -o hub-ctrl ./hub-ctrl.c/hub-ctrl.c -lusb
 # sudo cp hub-ctrl /usr/local/sbin/

mycodo/utils/update_dependencies.py

@@ -154,7 +154,7 @@ def get_installed_apt_dependencies():
     apt_deps = " ".join(installed_apt_deps)
 
     if apt_deps:
-        update_cmd = f'apt-get install -y {apt_deps}'
+        update_cmd = f'apt install -y {apt_deps}'
         output, err, stat = cmd_output(update_cmd, user='root')
         formatted_output = output.decode("utf-8").replace('\\n', '\n')
         logger.info(formatted_output)