OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-tools Date: 07-Jul-2004 13:36:57
Branch: HEAD Handle: 2004070712365600
Modified files:
openpkg-tools/cmd dev.sh
Log:
fix problem where openpkg shell function gets confused when options
being passed to commands requiring execution inside current shell.
This happend after 1.24 introduced "pass arguments into development
shell ..."
Summary:
Revision Changes Path
1.27 +23 -6 openpkg-tools/cmd/dev.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
============================================================================
$ cvs diff -u -r1.26 -r1.27 dev.sh
--- openpkg-tools/cmd/dev.sh 6 Jul 2004 07:30:22 -0000 1.26
+++ openpkg-tools/cmd/dev.sh 7 Jul 2004 11:36:56 -0000 1.27
@@ -271,12 +271,29 @@
shift
if [ ".$1" = .dev ]; then
shift
- case $1 in
- package | pa* ) shift; openpkg_dev_package "$@"; cd . ;;
- branch | br* ) shift; openpkg_dev_branch "$@"; cd . ;;
- execute | ex* ) shift; openpkg_dev_execute "$@"; cd . ;;
- tools | to* ) shift; openpkg_dev_tools "$@"; cd . ;;
- srcdir | sr* ) shift; openpkg_dev_srcdir "$@"; cd . ;;
+ local cmd=""
+ local arg=""
+ local line=""
+ local e;
+ for e in "$@"; do
+ if [ ".${cmd}" = . ]; then
+ case $e in
+ -*) ;;
+ *) cmd="$e" ;;
+ esac
+ elif [ ".${arg}" = . ]; then
+ case $e in
+ -*) ;;
+ *) arg="$e" ;;
+ esac
+ fi
+ done
+ case ${cmd} in
+ package | pa* ) shift; openpkg_dev_package "${arg}"; cd . ;;
+ branch | br* ) shift; openpkg_dev_branch "${arg}"; cd . ;;
+ execute | ex* ) shift; openpkg_dev_execute "${arg}"; cd . ;;
+ tools | to* ) shift; openpkg_dev_tools "${arg}"; cd . ;;
+ srcdir | sr* ) shift; openpkg_dev_srcdir "${arg}"; cd . ;;
* ) command $T/bin/openpkg dev "$@"
esac
elif [ ".$1" = .rpm ]; then
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
