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: 28-Apr-2004 10:47:40
Branch: HEAD Handle: 2004042809473900
Modified files:
openpkg-tools/cmd dev.sh
Log:
introduce query to get script ingredients from outside; reanimate
canonifybranch for comfortable branching
Summary:
Revision Changes Path
1.19 +26 -9 openpkg-tools/cmd/dev.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-tools/cmd/dev.sh
============================================================================
$ cvs diff -u -r1.18 -r1.19 dev.sh
--- openpkg-tools/cmd/dev.sh 28 Apr 2004 08:13:55 -0000 1.18
+++ openpkg-tools/cmd/dev.sh 28 Apr 2004 08:47:39 -0000 1.19
@@ -614,16 +614,19 @@
echo "${branch}"
else
branch="$1"
- if [ ".${branch}" = . ]; then
- return
- fi
- #FIXME canonifybranch "${1}"
- if [ ".${branch}" = .HEAD ]; then
- HOME=${OPENPKG_WORK} cvs update -A
- else
- HOME=${OPENPKG_WORK} cvs update -r ${branch}
+ if [ ".${branch}" != . ]; then
+ if [ ".${branch}" != .-A -a ".${OPENPKG_TOOLS_CMDPROG}" != . -a
".${OPENPKG_TOOLS_CMDNAME}" != . ]; then
+ branch="`${OPENPKG_TOOLS_CMDPROG} ${OPENPKG_TOOLS_CMDNAME} query
canonifybranch \"${branch}\"`"
+ fi
+ if [ ".${branch}" = .HEAD ]; then
+ HOME=${OPENPKG_WORK} cvs update -A
+ elif [ ".${branch}" = .-A ]; then
+ HOME=${OPENPKG_WORK} cvs update -A
+ branch=""
+ else
+ HOME=${OPENPKG_WORK} cvs update -r ${branch}
+ fi
fi
-
OPENPKG_CTAG=${branch}
cd .
fi
@@ -2213,6 +2216,19 @@
done
}
+query () {
+ while [ ".$1" != . ]; do
+ RV=""
+ case ".$1" in
+ .ma* ) shift; matchinstance $1 ;;
+ .ca* ) shift; canonifybranch $1 ;;
+ * ) RV="ERROR: unknow query \"$1\"" ;;
+ esac
+ echo "$RV"
+ shift
+ done
+}
+
help () {
if [ -d ${OPENPKG_WORK} ]; then
out="tee ${OPENPKG_WORK}/00README"
@@ -2289,6 +2305,7 @@
new | ne* ) cmd="new" ;;
package | pa* ) cmd="package" ;;
peek | pe* ) cmd="peek" ;;
+ query | qu* ) cmd="query" ;;
release | re* ) cmd="release" ;;
run | ru* ) cmd="run" ;;
setup ) cmd="setup" ;;
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
