[gtk-osx] Bug 766379 - There is no python2 on OS X: 3rd try.
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-osx] Bug 766379 - There is no python2 on OS X: 3rd try.
- Date: Sat, 21 May 2016 16:59:36 +0000 (UTC)
commit 56227f713dd15281ed051bf2d822eb8acfdb06c0
Author: John Ralls <jralls ceridwen us>
Date: Sat May 21 09:57:37 2016 -0700
Bug 766379 - There is no python2 on OS X: 3rd try.
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.
gtk-osx-build-setup.sh | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/gtk-osx-build-setup.sh b/gtk-osx-build-setup.sh
index 94e8b03..f9ed8c5 100755
--- a/gtk-osx-build-setup.sh
+++ b/gtk-osx-build-setup.sh
@@ -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
@@ -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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]