Skip to content

Commit 55a3086

Browse files
committed
Revert "mac: update python to use whatever is latest"
This reverts commit 4f419ff.
1 parent 4f419ff commit 55a3086

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

install/local/install-scrypted-dependencies-mac.sh

+11-12
Original file line numberDiff line numberDiff line change
@@ -52,30 +52,29 @@ RUN_IGNORE gobject-introspection libffi pkg-config
5252
RUN_IGNORE brew install gstreamer
5353

5454
ARCH=$(arch)
55-
# this is no longer necessary since tflite uses portable python.
56-
# if [ "$ARCH" = "arm64" ]
57-
# then
58-
# PYTHON_VERSION=3.10
59-
# else
60-
# PYTHON_VERSION=3.9
61-
# fi
62-
PYTHON_VERSION=3
55+
if [ "$ARCH" = "arm64" ]
56+
then
57+
PYTHON_VERSION=3.10
58+
else
59+
PYTHON_VERSION=3.9
60+
fi
6361

6462
RUN_IGNORE brew install python@$PYTHON_VERSION
65-
# will return /opt/homebrew/opt/[email protected] or similar
6663
PYTHON_PATH=$(brew --prefix python@$PYTHON_VERSION)
6764
PYTHON_BIN_PATH=
6865
SCRYPTED_PYTHON_PATH=
6966
if [ -d "$PYTHON_PATH" ]
7067
then
71-
# strip off the versioned path from above, and use brew bin path directly in case user updates python version.
72-
PYTHON_BIN_PATH=$(brew --prefix)/bin
73-
PYTHON_PATH=$PYTHON_BIN_PATH/python$PYTHON_VERSION
68+
PYTHON_BIN_PATH=$PYTHON_PATH/bin
7469
export PATH=$PYTHON_BIN_PATH:$PATH
7570
export SCRYPTED_PYTHON_PATH=python$PYTHON_VERSION
7671
fi
7772

7873
RUN python$PYTHON_VERSION -m pip install --upgrade pip
74+
if [ "$PYTHON_VERSION" != "3.10" ]
75+
then
76+
RUN python$PYTHON_VERSION -m pip install typing
77+
fi
7978
RUN python$PYTHON_VERSION -m pip install debugpy typing_extensions opencv-python psutil
8079

8180
echo "Installing Scrypted Launch Agent..."

0 commit comments

Comments
 (0)