Skip to content

Use commands that work on macOS #1837

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

Merged
WyattBlue merged 2 commits into from
Mar 28, 2025
Merged

Use commands that work on macOS #1837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11f5ce6
Use commands that work on macOS
daveisfera Mar 28, 2025
76d09db
Change check for zsh instead of macOS
daveisfera Mar 28, 2025
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
6 changes: 5 additions & 1 deletion scripts/activate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ if [[ "$0" == "${BASH_SOURCE[0]}" ]]; then
exit 1
fi

export PYAV_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.."; pwd)"
if [[ -n "$ZSH_VERSION" ]]; then
export PYAV_ROOT="$(realpath -- "$(dirname -- "$(readlink -f -- "$0")")/..")"
else
export PYAV_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.."; pwd)"
fi

if [[ ! "$PYAV_LIBRARY" ]]; then
if [[ "$1" ]]; then
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-deps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ cd "$PYAV_LIBRARY_ROOT"
if [[ ! -d $PYAV_LIBRARY ]]; then
url="https://ffmpeg.org/releases/$PYAV_LIBRARY.tar.gz"
echo Downloading $url
wget --no-check-certificate "$url" || exit 1
curl "$url" --output ${PYAV_LIBRARY}.tar.gz || exit 1
tar -xzf $PYAV_LIBRARY.tar.gz
rm $PYAV_LIBRARY.tar.gz
echo
Expand Down
Loading