X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=libs%2Fuvl%2Froot%2Fusr%2Fbin%2Fuvl;h=83ed73941d329776bb9176879fc3696ff6f36489;hb=19e22598fd5b43a4e3e23e5e0d5f994281024035;hp=b859097fa20034a94a3dc573e91ca72f7f6c6327;hpb=d564e036b3524e07e48d3b9a82d02cc66c7da989;p=project%2Fluci.git

diff --git a/libs/uvl/root/usr/bin/uvl b/libs/uvl/root/usr/bin/uvl
index b859097fa..83ed73941 100755
--- a/libs/uvl/root/usr/bin/uvl
+++ b/libs/uvl/root/usr/bin/uvl
@@ -149,9 +149,9 @@ $Id$
 
 Usage:
 	uvl --help
-	uvl [--silent] [--schemedir=DIR]
-		[--no-strict-sections] [--no-strict-options] [--no-strict-validators]
-		[--no-strict-lists] {verify|genspec} config[.section[.option]]
+	uvl [--silent] [--schemedir=DIR] [--configdir=DIR] [--no-strict-sections] \
+		[--no-strict-options] [--no-strict-validators] [--no-strict-lists] \
+		{verify|verify-scheme|genspec} config[.section[.option]]
 
 Options:
 	--help
@@ -163,6 +163,9 @@ Options:
 	--schemedir=DIR
 		Use DIR as scheme directory.
 
+	--configdir=DIR
+		Use DIR as config directory.
+
 	--no-strict-sections
 		Don't treat sections found in config but not in scheme as error.
 
@@ -179,33 +182,51 @@ Actions:
 	verify
 		Validate given configuration, section or option.
 
+	verify-scheme
+		Validate given scheme against the reference meta scheme.
+
 	genspec
 		Generate a scheme skeleton from given configuration.
 	]=])
 	os.exit(255)
-elseif arguments[1] == "verify" then
+elseif arguments[1] == "verify" or arguments[1] == "verify-scheme" then
 	luci.uvl.STRICT_UNKNOWN_SECTIONS =
-		( options['no-strict-sections'] and false or true )
+		( not options['no-strict-sections'] and true or false )
 	luci.uvl.STRICT_UNKNOWN_OPTIONS =
-		( options['no-strict-options'] and false or true )
+		( not options['no-strict-options'] and true or false )
 	luci.uvl.STRICT_EXTERNAL_VALIDATORS =
-		( options['no-strict-validators'] and false or true )
+		( not options['no-strict-validators'] and true or false )
 	luci.uvl.STRICT_LIST_TYPE =
-		( options['no-strict-lists'] and false or true )
+		( not options['no-strict-lists'] and true or false )
 
 	local uvl = luci.uvl.UVL(
-		type(options.schemedir) == "string" and options.schemedir or nil
+		type(options.schemedir) == "string" and options.schemedir
 	)
 
 	local cso = luci.util.split( arguments[2], "." )
-	local ok, err = uvl:validate( unpack(cso) )
+	local ok, err
+
+	if arguments[1] == "verify-scheme" then
+		uvl:read_scheme( 'schema', cso[1] )
+
+		local uci = uvl.uci.cursor(
+			type(options.configdir) == "string"
+				and options.configdir or uvl.schemedir .. '/default'
+		)
+
+		ok, err = uvl:validate_config( cso[1], uci:get_all(cso[1]) )
+		if err then err.code = luci.uvl.errors.ERR_SCHEME end
+	else
+		ok, err = uvl:validate( unpack(cso) )
+	end
 
 	if ok then
 		if not options.silent then
 			print( string.format(
 				'%s "%s" validates fine!',
-					( #cso == 1 and "Config" or
-						( #cso == 2 and "Section" or "Option" ) ),
+					( arguments[1] == "verify-scheme" and "Scheme" or
+						( #cso == 1 and "Config" or
+							( #cso == 2 and "Section" or "Option" ) ) ),
 					table.concat(cso, ".")
 			) )
 		end