Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
F
ffbs-gluon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
darkbit
ffbs-gluon
Commits
17bf2288
Commit
17bf2288
authored
10 years ago
by
Matthias Schiffer
Browse files
Options
Downloads
Patches
Plain Diff
Add helper scripts used by packages to validate site.conf
parent
6e0c29fc
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
include/package.mk
+8
-0
8 additions, 0 deletions
include/package.mk
scripts/check_site.sh
+8
-0
8 additions, 0 deletions
scripts/check_site.sh
scripts/check_site_lib.lua
+85
-0
85 additions, 0 deletions
scripts/check_site_lib.lua
with
101 additions
and
0 deletions
include/package.mk
0 → 100644
+
8
−
0
View file @
17bf2288
include
$(INCLUDE_DIR)/package.mk
# Annoyingly, make's shell function replaces all newlines with spaces, so we have to do some escaping work. Yuck.
define
GluonCheckSite
[
-z
"$$GLUONDIR"
]
||
sed
-e
's/-@/\n/g'
-e
's/+@/@/g'
<<
'END__GLUON__CHECK__SITE'
|
"$$GLUONDIR"
/scripts/check_site.sh
$(
shell
cat
$(
1
)
|
sed
-ne
'1h; 1!H; $$ {g; s/@/+@/g; s/\n/-@/g; p
}
')
END__GLUON__CHECK__SITE
endef
This diff is collapsed.
Click to expand it.
scripts/check_site.sh
0 → 100755
+
8
−
0
View file @
17bf2288
#!/bin/sh
export
GLUON_SITE_CONFIG
=
"
$GLUONDIR
/site/site.conf"
SITE_CONFIG_LUA
=
packages/gluon/gluon/gluon-core/files/usr/lib/lua/gluon/site_config.lua
CHECK_SITE_LIB
=
scripts/check_site_lib.lua
"
$GLUONDIR
"
/openwrt/staging_dir/host/bin/lua
-e
"site = dofile(os.getenv('GLUONDIR') .. '/
${
SITE_CONFIG_LUA
}
'); dofile(os.getenv('GLUONDIR') .. '/
${
CHECK_SITE_LIB
}
'); dofile()"
This diff is collapsed.
Click to expand it.
scripts/check_site_lib.lua
0 → 100644
+
85
−
0
View file @
17bf2288
local
function
loadvar
(
varname
)
local
ok
,
val
=
pcall
(
assert
(
loadstring
(
'return site.'
..
varname
)))
if
ok
then
return
val
else
return
nil
end
end
local
function
assert_type
(
var
,
t
,
msg
)
assert
(
type
(
var
)
==
t
,
msg
)
end
function
need_string
(
varname
,
required
)
local
var
=
loadvar
(
varname
)
if
required
==
false
and
var
==
nil
then
return
nil
end
assert_type
(
var
,
'string'
,
"site.conf error: expected `"
..
varname
..
"' to be a string"
)
return
var
end
function
need_string_match
(
varname
,
pat
,
required
)
local
var
=
need_string
(
varname
,
required
)
if
not
var
then
return
nil
end
assert
(
var
:
match
(
pat
),
"site.conf error: expected `"
..
varname
..
"' to match pattern `"
..
pat
..
"'"
)
return
var
end
function
need_number
(
varname
,
required
)
local
var
=
loadvar
(
varname
)
if
required
==
false
and
var
==
nil
then
return
nil
end
assert_type
(
var
,
'number'
,
"site.conf error: expected `"
..
varname
..
"' to be a number"
)
return
var
end
function
need_array
(
varname
,
subcheck
,
required
)
local
var
=
loadvar
(
varname
)
if
required
==
false
and
var
==
nil
then
return
nil
end
assert_type
(
var
,
'table'
,
"site.conf error: expected `"
..
varname
..
"' to be an array"
)
for
_
,
e
in
ipairs
(
var
)
do
subcheck
(
e
)
end
return
var
end
function
need_table
(
varname
,
subcheck
,
required
)
local
var
=
loadvar
(
varname
)
if
required
==
false
and
var
==
nil
then
return
nil
end
assert_type
(
var
,
'table'
,
"site.conf error: expected `"
..
varname
..
"' to be a table"
)
for
k
,
v
in
pairs
(
var
)
do
subcheck
(
k
,
v
)
end
return
var
end
function
need_string_array
(
varname
,
required
)
return
assert
(
pcall
(
need_array
,
varname
,
function
(
e
)
assert_type
(
e
,
'string'
)
end
,
required
),
"site.conf error: expected `"
..
varname
..
"' to be a string array"
)
end
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment