commit bf0f740f7c2efadeb4d7989785945e345ecf0fd1
author Sam Leffler <sleffler@google.com> Wed Jun 14 10:15:10 2023 -0700
committer Sam Leffler <sleffler@google.com> Wed Jun 14 10:34:15 2023 -0700
tree 9feed64876bb56da9f3c4dcbfea1beed6bbbce4d
parent 212506ac6c434d076e15ee381e0d68da7cc1cf2b

scripts: make install-prereqs more robust

Platform-dependent prereqs might supply empty arguments; handle malformed
arguments more gracefully.

Bug: 287091260

Change-Id: I7d0878e5a3848e15947b8ab36483235845a2de34

install-prereqs.sh

diff --git a/install-prereqs.sh b/install-prereqs.sh
index 81e9073..3d5310d 100755
--- a/install-prereqs.sh
+++ b/install-prereqs.sh
@@ -114,10 +114,10 @@
 }
 
 function try_install_apt_packages {
-    sudo_try apt-get update
-    sudo_try apt-get install -y "${APT_PACKAGES[@]}"
-
     if [[ ! -z "${APT_REQUIREMENTS}" ]]; then
+        sudo_try apt-get update
+        sudo_try apt-get install -y "${APT_PACKAGES[@]}"
+
         sed 's/#.*//' "${APT_REQUIREMENTS}" | sudo_try xargs apt-get install -y
     fi
 }
@@ -141,10 +141,12 @@
             PIP_INSTALL_ARGS+=("-r" "${REQ_FILE}")
         done
         pip3 install "${PIP_INSTALL_ARGS[@]}"
-        # Install flatbuffer from local source
-        # Note: Specify a version based on a fixed timestamp so tensorflow
-        # module won't complain about it (>=23.1.21).
-        VERSION=v20230510 pip3 install "${ROOTDIR}/sw/flatbuffers/python"
+        if [[ -d "${ROOTDIR}/sw/flatbuffers/python" ]]; then
+            # Install flatbuffer from local source
+            # Note: Specify a version based on a fixed timestamp so tensorflow
+            # module won't complain about it (>=23.1.21).
+            VERSION=v20230510 pip3 install "${ROOTDIR}/sw/flatbuffers/python"
+        fi
     fi
 }