Skip to content

Commit

Permalink
Bug 766379 - There is no python2 on OS X: Reprise
Browse files Browse the repository at this point in the history
Move the link creation to the start of the script so that it blocks
the incorrect link creation in jhbuild installation instead of the
other way around.
  • Loading branch information
jralls committed May 20, 2016
1 parent 7729717 commit 9b13365
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions gtk-osx-build-setup.sh
Expand Up @@ -47,6 +47,10 @@ 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 @@ -87,6 +91,7 @@ if [ -e "$SOURCE/jhbuild/autogen.sh" ]; then
else
(cd $SOURCE/jhbuild && make -f Makefile.plain DISABLE_GETTEXT=1 install >/dev/null) || do_exit "Jhbuild installation failed";
fi

#If ~/.jhbuildrc is a link, assume that it's to a gtk-osx repository
#and don't touch it.
if [ ! -L $HOME/.jhbuildrc ]; then
Expand All @@ -107,9 +112,7 @@ 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; 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 9b13365

Please sign in to comment.