[gtk-osx] Use full paths to pyenv and pipenv, path not set.



commit 178b8093f84d5c6eccbeede8c25858a7aef8324c
Author: John Ralls <jralls ceridwen us>
Date:   Fri Jul 2 11:41:24 2021 -0700

    Use full paths to pyenv and pipenv, path not set.
    
    Fixes https://gitlab.gnome.org/GNOME/gtk-osx/-/issues/40

 gtk-osx-setup.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/gtk-osx-setup.sh b/gtk-osx-setup.sh
index 1a8b543f..eb8be506 100755
--- a/gtk-osx-setup.sh
+++ b/gtk-osx-setup.sh
@@ -167,7 +167,7 @@ export DEV_SRC_ROOT="$DEV_SRC_ROOT"
 export PYENV_ROOT="$PYENV_ROOT"
 export PIP_CONFIG_DIR="$PIP_CONFIG_DIR"
 export LANG=C
-eval "$(pyenv init -)"
+eval "$($DEVPREFIX/bin/pyenv init -)"
 EOF
 
 cat <<EOF > "$DEVPREFIX/bin/jhbuild"
@@ -181,7 +181,7 @@ export PATH="$PYENV_ROOT/shims:$DEVPREFIX/bin:$PATH"
 export PYENV_ROOT="$PYENV_ROOT"
 export RUSTUP_HOME="$RUSTUP_HOME"
 
-exec pipenv run jhbuild \$@
+exec $DEVPREFIX/bin/pipenv run jhbuild \$@
 EOF
 
 if test ! -d "$DEVPREFIX/libexec" ; then
@@ -227,7 +227,7 @@ SDKROOT=`xcrun --show-sdk-path`
 export PIPENV_DOTENV_LOCATION="$DEVPREFIX/etc/pipenv-env"
 export PIPENV_PIPFILE="$DEVPREFIX/etc/Pipfile"
 export PATH="$PYENV_ROOT/shims:$DEVPREFIX/bin:$PYENV_INSTALL_ROOT/plugins/python-build/bin:$PATH"
-export PYENV_ROOT
+
 if test -d "$SDKROOT"; then
     export CFLAGS="-isysroot $SDKROOT -I$SDKROOT/usr/include"
 fi


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]