Skip to content

Commit

Permalink
Bug 766379 - There is no python2 on OS X: 3rd try.
Browse files Browse the repository at this point in the history
There's likely no $HOME/.local/bin until jhbuild's make install creates
it, so test for and remove the link to /usr/bin/python that jhbuild's
debian-python2-post-install hook creates.
  • Loading branch information
jralls committed May 21, 2016
1 parent 9b13365 commit 56227f7
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions gtk-osx-build-setup.sh
Expand Up @@ -47,10 +47,6 @@ if test x`which git` == x; then
do_exit "Git is not available, please install it and try again."
fi

if test ! -f $HOME/.local/bin/python2; then
ln -s /System/Library/Frameworks/Python.framework/Versions/Current/bin/python2 ~/.local/bin/python2
fi

mkdir -p $SOURCE 2>/dev/null || do_exit "The directory $SOURCE could not be created. Check permissions and try again."

rm -f tmp-jhbuild-revision
Expand Down Expand Up @@ -112,7 +108,10 @@ MODULES="bootstrap.modules gtk-osx-bootstrap.modules gtk-osx.modules gtk-osx-gst
for m in $MODULES; do
get_moduleset_from_git $m
done

if test -f $HOME/.local/bin/python2 -a x`readlink $HOME/.local/bin/python2` = x"/usr/bin/python"; then rm $HOME/.local/bin/python2; fi
if test ! -f $HOME/.local/bin/python2; then
ln -s /System/Library/Frameworks/Python.framework/Versions/Current/bin/python2 ~/.local/bin/python2
fi
if test "x`echo $PATH | grep $HOME/.local/bin`" == x; then
echo "PATH does not contain $HOME/.local/bin, it is recommended that you add that."
echo
Expand Down

0 comments on commit 56227f7

Please sign in to comment.