From 40eacb0741c791d64db1037f9f1cae413f6c1827 Mon Sep 17 00:00:00 2001 From: Daniel Pavel Date: Tue, 6 Nov 2012 17:38:49 +0200 Subject: [PATCH] LD_LIBRARY_PATH no longer needed --- bin/hidconsole | 5 +++-- bin/scan | 5 +++-- bin/solaar | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/bin/hidconsole b/bin/hidconsole index 743aaf61..b876a386 100755 --- a/bin/hidconsole +++ b/bin/hidconsole @@ -1,7 +1,8 @@ #!/bin/sh -LIB=`dirname "$0"`/../lib -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIB/native/`arch` +Z=`readlink -f "$0"` +LIB=`readlink -f $(dirname "$Z")/../lib` +#export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIB/native/`arch` export PYTHONPATH=$LIB PYTHON=`which python python2 python3 | head -n 1` diff --git a/bin/scan b/bin/scan index 20e87ba4..8b5cb8c7 100755 --- a/bin/scan +++ b/bin/scan @@ -1,7 +1,8 @@ #!/bin/sh -LIB=`dirname "$0"`/../lib -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIB/native/`arch` +Z=`readlink -f "$0"` +LIB=`readlink -f $(dirname "$Z")/../lib` +#export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIB/native/`arch` export PYTHONPATH=$LIB PYTHON=`which python python2 python3 | head -n 1` diff --git a/bin/solaar b/bin/solaar index fdf11a30..595ca7cb 100755 --- a/bin/solaar +++ b/bin/solaar @@ -5,7 +5,7 @@ APP=`readlink -f $(dirname "$Z")/../app` LIB=`readlink -f $(dirname "$Z")/../lib` SHARE=`readlink -f $(dirname "$Z")/../share` -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIB/native/`arch` +#export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$LIB/native/`arch` export PYTHONPATH=$APP:$LIB export XDG_DATA_DIRS=$SHARE:$XDG_DATA_DIRS