|
|
@@ -167,14 +167,15 @@ if [ ".${opt_help}" = .yes ]; then
|
|
|
continue
|
|
|
fi
|
|
|
for cmd in `cd ${dir} 2>/dev/null && echo *`; do
|
|
|
- is_cmd=`echo "${cmd}" | sed -e 's/\.sh$//' -e 's/\.pl$//' \
|
|
|
+ name=`echo "${cmd}" | sed -e 's/\.sh$//' -e 's/\.pl$//' \
|
|
|
-e 's/^/X/' -e 's/^X\([a-z][a-zA-Z0-9_-]*\)$/\1/' -e 's/^X.*$//'`
|
|
|
- if [ ".${is_cmd}" != . ]; then
|
|
|
+ if [ ".${name}" != . ]; then
|
|
|
if [ -f ${dir}/${cmd} ]; then
|
|
|
- id=`echo "${cmd}" | sed -e 's/-/_/g' -e 's/\.sh$//' -e 's/\.pl$//'`
|
|
|
+ id=`echo "${name}" | sed -e 's/-/_/g'`
|
|
|
eval "seen=\$__cmd_seen_${id}"
|
|
|
if [ ".${seen}" != .yes ]; then
|
|
|
- echo "${cmd}" | awk '{ printf(" %-15s (provided by add-on package)\n", $0); }'
|
|
|
+ echo "${name}" | awk '{ printf(" %-15s (provided by add-on package)\n", $0); }'
|
|
|
+ eval "__cmd_seen_${id}=yes"
|
|
|
fi
|
|
|
fi
|
|
|
fi
|
|
|
@@ -286,6 +287,7 @@ if [ ".${cmd_path}" = . ]; then
|
|
|
fi
|
|
|
|
|
|
# export essential run-time information to command
|
|
|
+export OPENPKG_PREFIX="$openpkg_prefix"
|
|
|
export OPENPKG_TOOLS_CMDPROG="${0}"
|
|
|
export OPENPKG_TOOLS_CMDNAME="${cmd}"
|
|
|
export OPENPKG_TOOLS_CMDSTACK=`echo "${OPENPKG_TOOLS_CMDSTACK}" | sed -e 's;^\(.\);:\1;' -e "s;^;${cmd};"`
|
