steffen: server obmtool,1.6,1.7

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv5971

Modified Files:
	obmtool 
Log Message:
obmtool-1.42

Index: obmtool
===================================================================
RCS file: /kolabrepository/server/obmtool,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- obmtool	23 Nov 2004 21:43:44 -0000	1.6
+++ obmtool	9 Mar 2005 13:59:16 -0000	1.7
@@ -3,7 +3,7 @@
 ##  obmtool -- OpenPKG poor man's Boot, Build & Management Tool
 ##  based on Ralf S. Engelschall's "devtool -- Development Tool"
 ##  Copyright (c) 2003 Thomas Lotterer <thomas at lotterer.net>
-##   Id: obmtool,v 1.40 2004/11/18 14:29:18 thl cvs.ZfOS.org
+##   Id: obmtool,v 1.42 2005/03/08 09:31:12 thl cvs.ZfOS.org
 ##  $Id$
 ##
 
@@ -197,6 +197,7 @@
 #   supports RELEASE and SOLID updates - autodetected by release id
 #   supports PLUS packages - prefix with '+'
 #   supports packages in CWD - prefix with './'
+#   supports packages with absolute pathes - prefix with '/'
 #   supports private repository - prefix with '=' and set URL
 #
 @locate ()
@@ -215,6 +216,14 @@
         return
     fi
 
+    # packages with absolute pathes
+    echo "${PKG}" | ${EGREP} >/dev/null '^\/'
+    if [ $? -eq 0 ]; then
+        PKG=`echo "${PKG}" | sed 's/^\/.*\///'`        # strip off leading path
+        LOC=`echo "${PKG}" | sed 's/\/[^\/][^\/]*$//'` # strip off trailing file/pkg
+        return
+    fi
+
     # private repository
     echo "${PKG}" | ${EGREP} >/dev/null '^='
     if [ $? -eq 0 ]; then
@@ -231,14 +240,14 @@
     fi
 
     # CURRENT
-    echo ${PKG} | ${EGREP} >/dev/null -- '-200[0-9][0-9]{4}$'
+    echo ${PKG} | ${EGREP} >/dev/null -- '-[2-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]$'
     if [ $? -eq 0 ]; then
         LOC="ftp://ftp.openpkg.org/current/SRC"
         return
     fi
 
     # STABLE
-    echo ${PKG} | ${EGREP} >/dev/null -- '-[0-9][0-9]*\.200[0-9][0-9]{4}$'
+    echo ${PKG} | ${EGREP} >/dev/null -- '-[0-9][0-9]*\.[2-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]$'
     if [ $? -eq 0 ]; then
         LOC="ftp://ftp.openpkg.org/stable/SRC"
         return