diff options
| author | Kali Kaneko <kali@leap.se> | 2015-08-31 14:54:52 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2015-08-31 14:54:52 -0400 |
| commit | f4547479fc050f338845f4f546d8dd7c0e4512eb (patch) | |
| tree | 0f737c7f102674230f5467ecaf17720e1d28f6eb /pkg/postmkvenv.sh | |
| parent | dd43dad4b150adb66e571a56a8a5c053dec858d0 (diff) | |
| parent | fd27f48a35736d8ba186c423a7de15ffee5143dd (diff) | |
Merge tag '0.9.0rc2' into debian/experimental
Tag leap.bitmask version 0.9.0rc2
Diffstat (limited to 'pkg/postmkvenv.sh')
| -rwxr-xr-x | pkg/postmkvenv.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkg/postmkvenv.sh b/pkg/postmkvenv.sh index 7b06fa6d..2407c69b 100755 --- a/pkg/postmkvenv.sh +++ b/pkg/postmkvenv.sh @@ -21,18 +21,21 @@ LIBS=( PySide pysideuic ) PYTHON_VERSION=python$(python -c "import sys; print (str(sys.version_info[0])+'.'+str(sys.version_info[1]))") VAR=( $(which -a $PYTHON_VERSION) ) -GET_PYTHON_LIB_CMD="from distutils.sysconfig import get_python_lib; print (get_python_lib())" +# this takes care of the /usr/lib vs /usr/lib64 differences between platforms +GET_PYTHON_LIB_CMD="from distutils.sysconfig import get_python_lib; print (get_python_lib(plat_specific=True))" +GET_PYSIDE_LIB_CMD="import PySide; print '/'.join(PySide.__path__[0].split('/')[:-1])" + LIB_VIRTUALENV_PATH=$(python -c "$GET_PYTHON_LIB_CMD") if [[ $platform == 'linux' ]]; then LIB_SYSTEM_PATH=$(${VAR[-1]} -c "$GET_PYTHON_LIB_CMD") elif [[ $platform == 'darwin' ]]; then ORIGINAL_PATH=$PATH - #change first colon of path to | because path substitution is greedy + # change first colon of path to | because path substitution is greedy PATH=${PATH/:/|} - #remove everything up to | from path + # remove everything up to | from path PATH=${PATH/*|/} - LIB_SYSTEM_PATH=$(python -c "$GET_PYTHON_LIB_CMD") + LIB_SYSTEM_PATH=$(/usr/bin/python -c "$GET_PYSIDE_LIB_CMD") PATH=$ORIGINAL_PATH else echo "unsupported platform; not doing symlinks" |