Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix/depthai installer for mac #1053

Merged
merged 6 commits into from
Aug 23, 2024
Merged

Fix/depthai installer for mac #1053

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fb95345
Install Homebrew and Git only if not installed already
Jul 15, 2024
b932a87
Don't just update the Brew
Jul 15, 2024
e4da54a
Don't just update the Brew
Jul 15, 2024
a390cbd
PyQt5 is already available for m1, no need for woraround
Jul 15, 2024
24ba6f3
improve the error message to find out easier which script failed
Jul 15, 2024
1f0f851
Add information messsage for macOS users about PATH configuration + R…
spbui00 Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 20 additions & 10 deletions docs/source/_static/install_dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,16 +155,26 @@ lookup_debian_version_number() {
}

if [[ $(uname) == "Darwin" ]]; then
echo "During Homebrew install, certain commands need 'sudo'. Requesting access..."
sudo true
homebrew_install_url="https://raw.githubusercontent.com/Homebrew/install/master/install.sh"
print_action "Installing Homebrew from $homebrew_install_url"
# CI=1 will skip some interactive prompts
CI=1 /bin/bash -c "$(curl -fsSL $homebrew_install_url)"
print_and_exec brew install git
echo
echo "=== Installed successfully! IMPORTANT: For changes to take effect,"
echo "please close and reopen the terminal window, or run: exec \$SHELL"
if ! command -v brew &> /dev/null; then
echo "During Homebrew install, certain commands need 'sudo'. Requesting access..."
sudo true
homebrew_install_url="https://raw.githubusercontent.com/Homebrew/install/master/install.sh"
print_action "Installing Homebrew from $homebrew_install_url"
# CI=1 will skip some interactive prompts
CI=1 /bin/bash -c "$(curl -fsSL $homebrew_install_url)"
echo
echo "=== Installed successfully! IMPORTANT: For changes to take effect,"
echo "please close and reopen the terminal window, or run: exec \$SHELL"
else
echo "Homebrew is already installed."
fi

if ! command -v git &> /dev/null; then
echo "Git not found, installing using Homebrew..."
print_and_exec brew install git
else
echo "Git Already installed.."
fi

elif [ -f /etc/os-release ]; then
source /etc/os-release
Expand Down
25 changes: 2 additions & 23 deletions docs/source/_static/install_depthai.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ mkdir "$WORKING_DIR"
install_path=""
path_correct="false"

trap 'RET=$? ; echo -e >&2 "\n\x1b[31mFailed installing dependencies. Could be a bug in the installer or unsupported platform. Open a bug report over at https://github.com/luxonis/depthai - exited with status $RET at line $LINENO \x1b[0m\n" ; exit $RET' ERR
trap 'RET=$? ; echo -e >&2 "\n\x1b[31mFailed installing depthai. Could be a bug in the installer or unsupported platform. Open a bug report over at https://github.com/luxonis/depthai - exited with status $RET at line $LINENO \x1b[0m\n" ; exit $RET' ERR

while [ "$path_correct" = "false" ]
do
Expand Down Expand Up @@ -127,9 +127,6 @@ if [[ $(uname -s) == "Darwin" ]]; then
echo "Installing global dependencies."
bash -c "$(curl -fL https://docs.luxonis.com/install_dependencies.sh)"

echo "Upgrading brew."
brew update

Comment on lines -130 to -132
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@PetrNovota this is not needed anymore or was it never needed?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this was never needed. I think this is actually relatively dangerous to do without the users permission.

# clone depthai form git
if [ -d "$DEPTHAI_DIR" ]; then
echo "Demo app already downloaded. Checking out main and updating."
Expand All @@ -142,20 +139,13 @@ if [[ $(uname -s) == "Darwin" ]]; then
git checkout main
git pull

# install python 3.10 and python dependencies
brew update

if [ "$install_python" == "true" ]; then
echo "installing python 3.10"
brew install [email protected]
python_executable=$(which python3.10)
fi

# pip does not have pyqt5 for arm
if [[ $(uname -m) == 'arm64' ]]; then
echo "Installing pyqt5 with homebrew."
brew install pyqt@5
fi
moratom marked this conversation as resolved.
Show resolved Hide resolved

# create python virtual environment
echo "Creating python virtual environment in $VENV_DIR"
Expand All @@ -166,18 +156,7 @@ if [[ $(uname -s) == "Darwin" ]]; then
python -m pip install --upgrade pip

# install launcher dependencies
# only on mac silicon point PYTHONPATH to pyqt5 installation via homebrew, otherwise install pyqt5 with pip
if [[ $(uname -m) == 'arm64' ]]; then
if [[ ":$PYTHONPATH:" == *":/opt/homebrew/lib/python3.10/site-packages:"* ]]; then
echo "/opt/homebrew/lib/python$nr_1.$nr_2/site-packages already in PYTHONPATH"
else
export "PYTHONPATH=/opt/homebrew/lib/python$nr_1.$nr_2/site-packages:"$PYTHONPATH
echo "/opt/homebrew/lib/pythonv$nr_1.$nr_2/site-packages added to PYTHONPATH"
fi
else
pip install pyqt5
fi

pip install pyqt5
pip install packaging

elif [[ $(uname -s) == "Linux" ]]; then
Expand Down
Loading