Mirrored_Repos/msm
1
0
Fork 0
mirror of https://github.com/msmhq/msm.git synced 2024-08-30 18:12:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move the if block for making paths absolute into the server_set_property() function.

Browse Source
This commit is contained in:
Tristan Donkers 2015-08-23 10:06:14 +10:00
parent 4f85edb958
commit 3e9e72e128
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
init/msm
View File

@ -1714,7 +1714,13 @@ server_connected() {
# $2: The name of the server property # $2: The name of the server property
# $3: The value for the property # $3: The value for the property
server_set_property() { server_set_property() {
eval SERVER_$2[$1]=\"$3\" # If it is a path make that path absolute
if [[ "$2" =~ _PATH$ ]]; then
server_property "$1" PATH
eval SERVER_$2[$1]=\"${SERVER_PATH[$1]}/$3\"
else
eval SERVER_$2[$1]=\"$3\"
fi
} }
# Get the value of a server property # Get the value of a server property
@ -1823,12 +1829,6 @@ server_property() {
### Post-changes to variables after loading ### Post-changes to variables after loading
# If it is a path make that path absolute
if [[ "$2" =~ _PATH$ ]]; then
server_property "$1" PATH
eval SERVER_$2[$1]=\"${SERVER_PATH[$1]}/\${SERVER_$2[$1]}\"
fi
# Replace any place holders in a property we just loaded # Replace any place holders in a property we just loaded
case "$2" in case "$2" in
SCREEN_NAME) SCREEN_NAME)