From e95b7f5266f50168365fae6a564caa80976aa707 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Pi=C5=82atowski?= Date: Mon, 3 Jan 2022 12:28:01 +0100 Subject: [PATCH 1/4] Update install_dependencies.sh --- docs/source/_static/install_dependencies.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/_static/install_dependencies.sh b/docs/source/_static/install_dependencies.sh index fde9f57e9..455c99dba 100755 --- a/docs/source/_static/install_dependencies.sh +++ b/docs/source/_static/install_dependencies.sh @@ -32,8 +32,6 @@ readonly ubuntu_pkgs=( libsm6 libxext6 libgl1-mesa-glx - python3-pyqt5 - python3-pyqt5.qtquick qml-module-qtquick-controls2 qml-module-qt-labs-platform qtdeclarative5-dev @@ -51,6 +49,8 @@ readonly ubuntu_arm_pkgs=( # https://stackoverflow.com/a/53402396/5494277 libhdf5-dev libhdf5-dev + python3-pyqt5 + python3-pyqt5.qtquick libatlas-base-dev libjasper-dev # https://github.com/EdjeElectronics/TensorFlow-Object-Detection-on-the-Raspberry-Pi/issues/18#issuecomment-433953426 From 6abcb4f64271954777e4a8ae82a52788bcc9111f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Pi=C5=82atowski?= Date: Mon, 17 Jan 2022 15:26:40 +0100 Subject: [PATCH 2/4] update install script --- docs/source/_static/install_dependencies.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/docs/source/_static/install_dependencies.sh b/docs/source/_static/install_dependencies.sh index 455c99dba..549606093 100755 --- a/docs/source/_static/install_dependencies.sh +++ b/docs/source/_static/install_dependencies.sh @@ -49,8 +49,6 @@ readonly ubuntu_arm_pkgs=( # https://stackoverflow.com/a/53402396/5494277 libhdf5-dev libhdf5-dev - python3-pyqt5 - python3-pyqt5.qtquick libatlas-base-dev libjasper-dev # https://github.com/EdjeElectronics/TensorFlow-Object-Detection-on-the-Raspberry-Pi/issues/18#issuecomment-433953426 @@ -123,6 +121,15 @@ elif [ -f /etc/os-release ]; then sudo apt-get install -y "${ubuntu_arm_pkgs[@]}" python3 -m pip install --upgrade pip fi + if [[ -d /opt/ros ]]; then + echo "ROS detected - skipping \"python3-pyqt5\" and \"python3-pyqt5.qtquick\" installation. These packages can break ROS installation so please install them manually if needed" + else + if python3 -c "import PyQt5"; then + echo "PyQt5 already installed, skipping dependence" + else + sudo apt-get install -y python3-pyqt5 python3-pyqt5.qtquick + fi + fi elif [[ "$ID" == "fedora" ]]; then sudo dnf update -y sudo dnf install -y "${fedora_pkgs[@]}" From c64c3a35fd9c4b582fb954c3b1fdae8f26a1f9a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Pi=C5=82atowski?= Date: Mon, 17 Jan 2022 15:59:05 +0100 Subject: [PATCH 3/4] update install command --- docs/source/_static/install_dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/_static/install_dependencies.sh b/docs/source/_static/install_dependencies.sh index 549606093..af986ad0e 100755 --- a/docs/source/_static/install_dependencies.sh +++ b/docs/source/_static/install_dependencies.sh @@ -125,7 +125,7 @@ elif [ -f /etc/os-release ]; then echo "ROS detected - skipping \"python3-pyqt5\" and \"python3-pyqt5.qtquick\" installation. These packages can break ROS installation so please install them manually if needed" else if python3 -c "import PyQt5"; then - echo "PyQt5 already installed, skipping dependence" + echo "PyQt5 already installed, skipping..." else sudo apt-get install -y python3-pyqt5 python3-pyqt5.qtquick fi From d66f7d6ae08eb48201c863538d54e8872eafe41b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Pi=C5=82atowski?= Date: Mon, 17 Jan 2022 15:59:56 +0100 Subject: [PATCH 4/4] switch order of checks --- docs/source/_static/install_dependencies.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/_static/install_dependencies.sh b/docs/source/_static/install_dependencies.sh index af986ad0e..1ca7d581a 100755 --- a/docs/source/_static/install_dependencies.sh +++ b/docs/source/_static/install_dependencies.sh @@ -121,11 +121,11 @@ elif [ -f /etc/os-release ]; then sudo apt-get install -y "${ubuntu_arm_pkgs[@]}" python3 -m pip install --upgrade pip fi - if [[ -d /opt/ros ]]; then - echo "ROS detected - skipping \"python3-pyqt5\" and \"python3-pyqt5.qtquick\" installation. These packages can break ROS installation so please install them manually if needed" + if python3 -c "import PyQt5"; then + echo "PyQt5 already installed, skipping..." else - if python3 -c "import PyQt5"; then - echo "PyQt5 already installed, skipping..." + if [[ -d /opt/ros ]]; then + echo "ROS detected - skipping \"python3-pyqt5\" and \"python3-pyqt5.qtquick\" installation. These packages can break ROS installation so please install them manually if needed" else sudo apt-get install -y python3-pyqt5 python3-pyqt5.qtquick fi