aboutsummaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2009-02-10 12:31:47 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2009-02-10 12:31:47 +0000
commit82f92ba6d7d91935f069d300cb46b3e614b7964a (patch)
tree8708a814c524fe8e57e3a6aa98090d77a5f60d5d /bin
parent6cc877dcc77fbc68d747acd393426fcc6379ea92 (diff)
downloadqmmp-82f92ba6d7d91935f069d300cb46b3e614b7964a.tar.gz
qmmp-82f92ba6d7d91935f069d300cb46b3e614b7964a.tar.bz2
qmmp-82f92ba6d7d91935f069d300cb46b3e614b7964a.zip
some qmmp launcher improvements (Sebastian Pipping)
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@784 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'bin')
-rwxr-xr-xbin/qmmp_launcher17
1 files changed, 13 insertions, 4 deletions
diff --git a/bin/qmmp_launcher b/bin/qmmp_launcher
index 7813d3546..47e982a19 100755
--- a/bin/qmmp_launcher
+++ b/bin/qmmp_launcher
@@ -1,8 +1,17 @@
#!/bin/sh
MYDIR=$(dirname $0)
-LD_LIBRARY_PATH=$MYDIR/../lib:$MYDIR/../src/qmmpui:${LD_LIBRARY_PATH}
-printf '\nSetting LD_LIBRARY_PATH to '$LD_LIBRARY_PATH
+QT_LIB_DIR=$(dirname $(which qmake))/../lib
+QMMP_LIB_DIRS=$MYDIR/../lib:$MYDIR/../src/qmmpui
+
+if [ -z ${LD_LIBRARY_PATH} ]; then
+ LD_LIBRARY_PATH=${QMMP_LIB_DIRS}:${QT_LIB_DIR}
+else
+ LD_LIBRARY_PATH=${QMMP_LIB_DIRS}:${QT_LIB_DIR}:${LD_LIBRARY_PATH}
+fi
+
+echo 'Setting LD_LIBRARY_PATH to'
+echo "$LD_LIBRARY_PATH" | awk -F: '{ for(i = 1; i <= NF; i++) printf "%d) %s\n", i, $i; }'
export LD_LIBRARY_PATH
-printf '\n'$LD_LIBRARY_PATH
-printf '\n'
+echo
+
exec $MYDIR/qmmp "$@"