OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 09-Apr-2004 12:24:06
Branch: HEAD Handle: 2004040911240600
Modified files:
openpkg-src/openpkg openpkg.sh
Log:
fix a few remaining issues
Summary:
Revision Changes Path
1.8 +6 -4 openpkg-src/openpkg/openpkg.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.sh
============================================================================
$ cvs diff -u -r1.7 -r1.8 openpkg.sh
--- openpkg-src/openpkg/openpkg.sh 9 Apr 2004 09:49:29 -0000 1.7
+++ openpkg-src/openpkg/openpkg.sh 9 Apr 2004 10:24:06 -0000 1.8
@@ -167,14 +167,15 @@
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 @@
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};"`
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
