diff --git a/docs/source/_static/install_dependencies.sh b/docs/source/_static/install_dependencies.sh index 7298def5f..d635153b8 100755 --- a/docs/source/_static/install_dependencies.sh +++ b/docs/source/_static/install_dependencies.sh @@ -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 diff --git a/docs/source/_static/install_depthai.sh b/docs/source/_static/install_depthai.sh index e36ee888a..4dab117bd 100755 --- a/docs/source/_static/install_depthai.sh +++ b/docs/source/_static/install_depthai.sh @@ -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 @@ -109,6 +109,32 @@ BASHRC="$HOME/.bashrc" ZSHRC="$HOME/.zshrc" ADD_ENTRYPOINT_TO_PATH='export PATH=$PATH'":$ENTRYPOINT_DIR" +# Function to set crash reporting environment variable in shell configuration files +set_crash_reporting_env() { + local consent_value="$1" + local env_line="export DEPTHAI_ENABLE_ANALYTICS_COLLECTION=$consent_value" + + write_in_file "$env_line" "$BASHRC" + if [ -f "$ZSHRC" ]; then + write_in_file "$env_line" "$ZSHRC" + fi +} + +# Prompt for user consent to enable crash reporting +echo "" +echo "DepthAI can collect anonymous crash reports to help improve the software." +echo "Do you agree to enable crash reporting? (y/n)" +read -n 1 crash_report_consent < /dev/tty +echo "" + +if [[ "$crash_report_consent" == "y" || "$crash_report_consent" == "Y" ]]; then + echo "Crash reporting enabled." + set_crash_reporting_env "1" +else + echo "Crash reporting disabled." + set_crash_reporting_env "0" +fi + # add to .bashrc only if it is not in there already write_in_file "$COMMENT" "$BASHRC" write_in_file "$ADD_ENTRYPOINT_TO_PATH" "$BASHRC" @@ -127,9 +153,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 - # clone depthai form git if [ -d "$DEPTHAI_DIR" ]; then echo "Demo app already downloaded. Checking out main and updating." @@ -142,8 +165,6 @@ 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" @@ -151,11 +172,6 @@ if [[ $(uname -s) == "Darwin" ]]; then 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 # create python virtual environment echo "Creating python virtual environment in $VENV_DIR" @@ -166,18 +182,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