summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xremote/modules/pvs2/data/opt/openslx/bin/pvsstartup4
-rw-r--r--remote/modules/pvs2/module.build4
2 files changed, 4 insertions, 4 deletions
diff --git a/remote/modules/pvs2/data/opt/openslx/bin/pvsstartup b/remote/modules/pvs2/data/opt/openslx/bin/pvsstartup
index def24a81..b77dcd51 100755
--- a/remote/modules/pvs2/data/opt/openslx/bin/pvsstartup
+++ b/remote/modules/pvs2/data/opt/openslx/bin/pvsstartup
@@ -4,10 +4,10 @@
timediff=5
while [ $timediff -gt 3 ]; do
start="$(date +%s)"
- pvsclient $@
+ pvsclient "$@"
ret=$?
end="$(date +%s)"
- /opt/openslx/pvs2/unlock.sh
+ /opt/openslx/pvs2/kb-unlock.sh
[ "$ret" == "0" ] && break
timediff=$(( end - start ))
done
diff --git a/remote/modules/pvs2/module.build b/remote/modules/pvs2/module.build
index 70b88350..970c3c00 100644
--- a/remote/modules/pvs2/module.build
+++ b/remote/modules/pvs2/module.build
@@ -26,9 +26,9 @@ build() {
# copy external scripts under 'sample_configuration'
mkdir -p "${MODULE_BUILD_DIR}/opt/openslx/pvs2/"
if [ -d "${SRCDIR}/sample_configuration" ]; then
- cp ${SRCDIR}/sample_configuration/*.sh "${MODULE_BUILD_DIR}/opt/openslx/pvs2/" \
+ cp "${SRCDIR}/sample_configuration"/{kb-lock,kb-unlock,lockDesktop,switchToManager,switchBack}.sh "${MODULE_BUILD_DIR}/opt/openslx/pvs2/" \
|| perror "Could not copy external scripts to '${MODULE_BUILD_DIR}/opt/openslx/pvs2/'!"
- chmod +x ${MODULE_BUILD_DIR}/opt/openslx/pvs2/*.sh \
+ chmod +x "${MODULE_BUILD_DIR}/opt/openslx/pvs2"/*.sh \
|| perror "Could not set executable bit for external scripts."
fi