Skip to content
Browse files

Change /usr/local -> /usr/pbi/<app> before checking ldconfig dirs

  • Loading branch information...
1 parent b9ee7c2 commit c3b7eb847c582e16d52a133c11ca02682e878f55 @kmoore134 kmoore134 committed
Showing with 2 additions and 2 deletions.
  1. +2 −2 src-sh/pbi-manager/pbime/ldconfig
View
4 src-sh/pbi-manager/pbime/ldconfig
@@ -36,12 +36,12 @@ ldconfig_start()
fi
fi
done
+ ldconfig_paths=`echo $ldconfig_paths | sed "s|/usr/local|${PBI_RUNDIR}/local|g"`
for i in ${ldconfig_paths} /etc/ld-elf.so.conf; do
if [ -r "${i}" ]; then
_LDC="${_LDC} ${i}"
fi
done
- _LDC=`echo $_LDC | sed "s|/usr/local|${PBI_RUNDIR}/local|g"`
check_startmsgs && echo 'ELF ldconfig path:' ${_LDC}
${ldconfig} -elf ${_ins} -f ${ldconfig_file} ${_LDC}
@@ -56,6 +56,7 @@ ldconfig_start()
fi
done
_LDC=""
+ ldconfig32_paths=`echo $ldconfig_paths | sed "s|/usr/local|${PBI_RUNDIR}/local|g"`
for i in ${ldconfig32_paths}; do
if [ -r "${i}" ]; then
_LDC="${_LDC} ${i}"
@@ -63,7 +64,6 @@ ldconfig_start()
done
check_startmsgs &&
echo '32-bit compatibility ldconfig path:' ${_LDC}
- _LDC=`echo $_LDC | sed "s|/usr/local|${PBI_RUNDIR}/local|g"`
${ldconfig} -32 -m ${_ins} -f ${ldconfig32_file} ${_LDC}
;;
esac

0 comments on commit c3b7eb8

Please sign in to comment.
Something went wrong with that request. Please try again.