[Fai-commit] r4064 - trunk/lib

[fai-commit at lists.alioth.debian.org]

Author: lange
Date: 2006-10-07 09:39:29 +0000 (Sat, 07 Oct 2006)
New Revision: 4064

Modified:
   trunk/lib/get-config-dir-cvs
   trunk/lib/get-config-dir-svn
Log:
replace \s and \S in expr with regex using [:space:]
so it also works for sarge's version of expr


Modified: trunk/lib/get-config-dir-cvs
===================================================================
--- trunk/lib/get-config-dir-cvs	2006-10-07 09:23:18 UTC (rev 4063)
+++ trunk/lib/get-config-dir-cvs	2006-10-07 09:39:29 UTC (rev 4064)
@@ -12,8 +12,8 @@
 # matched string: "cvs[+ssh]://user at host/path/to/cvsroot module[=tag]"
 # dir contains user at host/path/to/cvsroot
 protocol=$(expr match "$FAI_CONFIG_SRC" '\([^:]*\)://')
-dir=$(expr match "$FAI_CONFIG_SRC" '[^:]*://\(\S\+\)\s\+')
-module=$(expr match "$FAI_CONFIG_SRC" '[^:]*://.*\s\+\([^=]*\)')
+dir=$(expr match "$FAI_CONFIG_SRC" '[^:]*://\([^[:space:]]\+\)[[:space:]]\+')
+module=$(expr match "$FAI_CONFIG_SRC" '[^:]*://.*[[:space:]]\+\([^=]*\)')
 tag=$(expr match "$FAI_CONFIG_SRC" '=\([^=]*\)')
 
 case $protocol in

Modified: trunk/lib/get-config-dir-svn
===================================================================
--- trunk/lib/get-config-dir-svn	2006-10-07 09:23:18 UTC (rev 4063)
+++ trunk/lib/get-config-dir-svn	2006-10-07 09:39:29 UTC (rev 4064)
@@ -12,7 +12,7 @@
 # matched string: "svn://user@host/svnpath"
 protocol=$(expr match "$FAI_CONFIG_SRC" '\([^:]*\)://')
 username=$(expr match "$FAI_CONFIG_SRC" '[^:]*://\([^@]*\)@')
-svnpath=$(expr match "$FAI_CONFIG_SRC" '[^:]*://[^@]\+@\(\S\+\)')
+svnpath=$(expr match "$FAI_CONFIG_SRC" '[^:]*://[^@]\+@\([^[:space:]]\+\)')
 
 case $protocol in
 	svn)