Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
JAliEn
vobox-scripts
Commits
c67443b4
Commit
c67443b4
authored
Sep 19, 2021
by
Maarten Litmaath
Browse files
- Avoid unwarranted error message.
- Cosmetic changes.
parent
417d1155
Changes
1
Hide whitespace changes
Inline
Side-by-side
jalien-ce.sh
View file @
c67443b4
...
...
@@ -84,7 +84,11 @@ function status_ce() {
if
[[
"
$command
"
==
mlstatus
]]
then
ceConfigVersion
=
$(
perl
-ne
'print $1 if /^\s*jalien\s*=\s*(\S+)/i'
$commonConf
)
ceConfigVersion
=
$(
[[
-f
"
$commonConf
"
]]
&&
perl
-ne
'print $1 if /^\s*jalien\s*=\s*(\S+)/i'
$commonConf
)
:
${
ceConfigVersion
:
=pro
}
if
[[
-n
"
$pid
"
]]
...
...
@@ -110,12 +114,12 @@ function status_ce() {
jaVersion
=
jconf
=
$JALIEN_CONF_DIR
/version.properties
if
[
-e
$jconf
]
if
[
[
-e
$jconf
]
]
then
jaVersion
=
$(
perl
-ne
'print $1 if /^\s*jobagent\.version\s*=\s*(\S+)/i'
$jconf
)
jardir
=
$(
perl
-ne
'print $1 if /^\s*custom\.jobagent\.jar\.dir\s*=\s*(\S+)/i'
$jconf
)
if
[
-e
"
$jardir
/alien-users.jar"
]
if
[
[
-e
"
$jardir
/alien-users.jar"
]
]
then
jaVersion
=
custom
fi
...
...
@@ -140,9 +144,9 @@ function status_ce() {
# Start MonaLisa
# Globals:
# siteConfiguration: Associative array of site configuration parameters in LDAP
#
commonConfiguration: Associative array of JAliEn local configuration parameters
#
commonConfiguration: Associative array of JAliEn local configuration parameters
# Arguments:
#
confDir: AliEn configuration directory
#
confDir: AliEn configuration directory
# ldapHostname: LDAP hostname
# ldapPort: LDAP port
# hostname: Site hostname
...
...
@@ -212,7 +216,6 @@ function start_ce() {
fi
setupLogFile
=
"
$logDir
/CE-config-inputs.txt"
commonConf
=
"
$confDir
/version.properties"
ceEnv
=
"
$confDir
/CE.env"
envCommand
=
"/cvmfs/alice.cern.ch/bin/alienv printenv JAliEn"
...
...
Write
Preview
Supports
Markdown
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!
Cancel
Please
register
or
sign in
to comment