From 756951f9344e51f44181d4284ae97d0074ee29bf Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sat, 7 Dec 2013 16:53:46 +0200
Subject: [PATCH] etc/profile.d: simplify PATH/LD_LIBRARY_PATH export

.. and move export LD_LIBRARY_PATH to busybox (where ot belongs)
---
 packages/mediacenter/xbmc/profile.d/02-xbmc.conf    | 11 ++---------
 packages/sysutils/busybox/profile.d/00-busybox.conf |  1 +
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/packages/mediacenter/xbmc/profile.d/02-xbmc.conf b/packages/mediacenter/xbmc/profile.d/02-xbmc.conf
index 7cc843c7fe..b8266886e4 100644
--- a/packages/mediacenter/xbmc/profile.d/02-xbmc.conf
+++ b/packages/mediacenter/xbmc/profile.d/02-xbmc.conf
@@ -19,20 +19,13 @@
 ################################################################################
 
 # PATH
-for addon in /storage/.xbmc/addons/*/bin; do
+for addon in /storage/.xbmc/addons/*/bin /usr/lib/xbmc/addons/*/bin; do
   [ -d "$addon" ] && PATH="$PATH:$addon"
 done
-for sys in /usr/lib/xbmc/addons/*/bin; do
-  [ -d "$sys" ] &&  PATH="$PATH:$sys"
-done
 export PATH
 
 # LD_LIBRARY_PATH
-LD_LIBRARY_PATH="/usr/lib:/lib"
-for addon in /storage/.xbmc/addons/*/lib; do
+for addon in /storage/.xbmc/addons/*/lib /usr/lib/xbmc/addons/*/lib; do
   [ -d "$addon" ] && LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$addon"
 done
-for sys in /usr/lib/xbmc/addons/*/lib; do
-  [ -d "$sys" ] && LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$sys"
-done
 export LD_LIBRARY_PATH
diff --git a/packages/sysutils/busybox/profile.d/00-busybox.conf b/packages/sysutils/busybox/profile.d/00-busybox.conf
index 2e4aaa23f4..3036122852 100644
--- a/packages/sysutils/busybox/profile.d/00-busybox.conf
+++ b/packages/sysutils/busybox/profile.d/00-busybox.conf
@@ -20,6 +20,7 @@
 
 export HOME="/storage"
 export PATH="/bin:/sbin:/usr/bin:/usr/sbin"
+export LD_LIBRARY_PATH="/usr/lib:/lib"
 export HOSTNAME=`cat /etc/hostname`
 export PS1="\[\e[1;32m\]\h\[\e[1;32m\]:\[\e[1;34m\]\w \[\e[0m\]\\$ "
 case "$TERM" in