From 92fcb85cb93ac55453659792e1d4e21a821ec18e Mon Sep 17 00:00:00 2001
From: brent s <bts@square-r00t.net>
Date: Fri, 19 Jun 2020 02:43:38 -0400
Subject: [PATCH] fixing repomirror and some patterns

---
 schema/lib/elements/repomirror.xsd | 2 +-
 schema/lib/types/unix.xsd          | 4 ++--
 schema/projects/repomirror.xsd     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/schema/lib/elements/repomirror.xsd b/schema/lib/elements/repomirror.xsd
index 1fa9dcc..777e81c 100644
--- a/schema/lib/elements/repomirror.xsd
+++ b/schema/lib/elements/repomirror.xsd
@@ -41,7 +41,7 @@
       <xs:element name="syncType" type="t_repomir_synctype" minOccurs="1"/>
       <xs:element name="domain" type="xs:token" minOccurs="1"/>
       <xs:element name="port" minOccurs="0" type="t_net_port"/>
-      <xs:element name="path" minOccurs="1" type="t_unix_filepath"/>
+      <xs:element name="path" minOccurs="1" type="t_unix_dirpath"/>
     </xs:all>
   </xs:complexType>
 
diff --git a/schema/lib/types/unix.xsd b/schema/lib/types/unix.xsd
index f9922e5..b2dcf2d 100644
--- a/schema/lib/types/unix.xsd
+++ b/schema/lib/types/unix.xsd
@@ -25,7 +25,7 @@
         dir: ^\s*(~?/[^/]*)+/?\s*$
         file: ^\s*(~?/[^/]+)+\s*$
         reldir: ^\s*[^/](([^/]*)+/?)+\s*$
-        relfile: ^\s*[^/]+([^/]*)+[^/]\s*$
+        relfile: ^\s*[^/]+(/|[^/]*)*[^/]+\s*$
   -->
   <!-- ABSOLUTE directory path -->
   <xs:simpleType name="t_unix_dirpath">
@@ -53,7 +53,7 @@
   <!-- RELATIVE file path -->
   <xs:simpleType name="t_unix_relfilepath">
     <xs:restriction base="xs:string">
-      <xs:pattern value="\s*[^/]+([^/]*)+[^/]\s*"/>
+      <xs:pattern value="\s*([^/]+)(/[^/]+)*([^/])*\s*"/>
       <xs:whiteSpace value="collapse"/>
     </xs:restriction>
   </xs:simpleType>
diff --git a/schema/projects/repomirror.xsd b/schema/projects/repomirror.xsd
index c28860c..4ca85d0 100644
--- a/schema/projects/repomirror.xsd
+++ b/schema/projects/repomirror.xsd
@@ -20,7 +20,7 @@
             <xs:sequence minOccurs="1">
               <xs:choice minOccurs="1" maxOccurs="unbounded">
                 <xs:element name="upstream" type="e_repomir_upstream" minOccurs="1" maxOccurs="unbounded"/>
-                <xs:element name="dest" type="t_unix_filepath" minOccurs="1" maxOccurs="1"/>
+                <xs:element name="dest" type="t_unix_dirpath" minOccurs="1" maxOccurs="1"/>
                 <xs:element name="lastLocalCheck" type="e_repomir_tstmp_file" minOccurs="0" maxOccurs="unbounded"/>
                 <xs:element name="lastLocalSync" type="e_repomir_tstmp_file" minOccurs="0" maxOccurs="unbounded"/>
                 <xs:element name="lastRemoteUpdate" type="e_repomir_tstmp_file" minOccurs="0" maxOccurs="1"/>