summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2016-10-10 19:55:27 +0200
committerSimon Rettberg2016-10-10 19:55:27 +0200
commita0ddd91d14a371ec692fa711c9e40cb6590e24f7 (patch)
treed2c7727f67665c33acdadf54e5686f149d8fddfa
parent[pvs2] Use command line option for config file location; use new client side ... (diff)
downloadtm-scripts-a0ddd91d14a371ec692fa711c9e40cb6590e24f7.tar.gz
tm-scripts-a0ddd91d14a371ec692fa711c9e40cb6590e24f7.tar.xz
tm-scripts-a0ddd91d14a371ec692fa711c9e40cb6590e24f7.zip
[pvs2] Let's try this....
-rwxr-xr-xremote/modules/pvs2/data/opt/openslx/scripts/setup-pvsmgr9
1 files changed, 5 insertions, 4 deletions
diff --git a/remote/modules/pvs2/data/opt/openslx/scripts/setup-pvsmgr b/remote/modules/pvs2/data/opt/openslx/scripts/setup-pvsmgr
index be44e87e..aaaf85d2 100755
--- a/remote/modules/pvs2/data/opt/openslx/scripts/setup-pvsmgr
+++ b/remote/modules/pvs2/data/opt/openslx/scripts/setup-pvsmgr
@@ -1,15 +1,16 @@
#!/bin/ash
. /opt/openslx/config
-DST="/opt/openslx/pvs2/pvs2.ini"
# Try to get fresh version from server
+CONF=
if [ -n "$SLX_PVS_CONFIG_URL" ]; then
- wget -T 5 -O "${DST}.new" "$SLX_PVS_CONFIG_URL"
- [ -s "${DST}.new" ] && mv -f "${DST}.new" "${DST}"
+ DST="$(mktemp)"
+ wget -T 5 -O "${DST}" "$SLX_PVS_CONFIG_URL"
+ [ -s "${DST}" ] && CONF="--config=${DST}"
fi
openbox &
-exec /opt/openslx/bin/pvsmgr "$@"
+exec /opt/openslx/bin/pvsmgr "$CONF" "$@"