Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
2
22c480376
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Summer2022
22c480376
Commits
cae18462
Commit
cae18462
authored
2 years ago
by
HereThereBeDragons
Browse files
Options
Downloads
Patches
Plain Diff
bash string comparison fixes for cvmfs server scripts
parent
2680af92
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cvmfs/server/cvmfs_server_json.sh
+1
-1
1 addition, 1 deletion
cvmfs/server/cvmfs_server_json.sh
cvmfs/server/cvmfs_server_util.sh
+2
-2
2 additions, 2 deletions
cvmfs/server/cvmfs_server_util.sh
with
3 additions
and
3 deletions
cvmfs/server/cvmfs_server_json.sh
+
1
−
1
View file @
cae18462
...
...
@@ -91,7 +91,7 @@ _render_info_file() {
echo
' "last_geodb_update" : "'
$modtime
'",'
fi
if
[
"x
${
CVMFS_PUBLISH_VERSIONS_IN_META_FILE
}
"
=
=
"xtrue"
]
;
then
if
[
"x
${
CVMFS_PUBLISH_VERSIONS_IN_META_FILE
}
"
=
"xtrue"
]
;
then
echo
' "cvmfs_version" : "'
$(
cvmfs_version_string
)
'",'
echo
' "os_id" : "'
$(
_os_id
)
'", '
echo
' "os_version_id" : "'
$(
_os_version_id
)
'", '
...
...
This diff is collapsed.
Click to expand it.
cvmfs/server/cvmfs_server_util.sh
+
2
−
2
View file @
cae18462
...
...
@@ -757,11 +757,11 @@ _os_etc_release_get_field() {
_os_set_etc_release_filename
local
fieldname
=
$1
if
[
"x
${
fieldname
}
"
=
=
"x"
]
;
then
if
[
"x
${
fieldname
}
"
=
"x"
]
;
then
die
"Internal error: _os_etc_release_get_field expects a field name to search for!"
fi
if
[
"x
${
_CVMFS_OS_RELEASE_FILENAME
}
"
=
=
"x"
]
;
then
if
[
"x
${
_CVMFS_OS_RELEASE_FILENAME
}
"
=
"x"
]
;
then
# If we are unable to find a proper /etc/os-release file return nothing.
:
else
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
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