diff options
| author | Simon Rettberg | 2016-09-08 11:30:51 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2016-09-08 11:30:51 +0200 |
| commit | 6fdaaf6b54f187f6961d1fc36cb5c76ed8d22879 (patch) | |
| tree | 1db26d1976894327ed40bc1c0e349bee30e88ac4 | |
| parent | Formatting (diff) | |
| download | tm-scripts-6fdaaf6b54f187f6961d1fc36cb5c76ed8d22879.tar.gz tm-scripts-6fdaaf6b54f187f6961d1fc36cb5c76ed8d22879.tar.xz tm-scripts-6fdaaf6b54f187f6961d1fc36cb5c76ed8d22879.zip | |
[pvs2] Renamed lock/unlock scripts
| -rwxr-xr-x | remote/modules/pvs2/data/opt/openslx/bin/pvsstartup | 4 | ||||
| -rw-r--r-- | remote/modules/pvs2/module.build | 4 |
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 |