diff options
| author | Simon Rettberg | 2013-09-10 13:50:18 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2013-09-30 13:22:05 +0200 |
| commit | 0ad37c4ff65131797d1fef91ba870cc547785779 (patch) | |
| tree | 0f897407e0e3c4f702b624e4e6fc5abbb3cef7e6 | |
| parent | Fix fix (diff) | |
| download | tm-scripts-0ad37c4ff65131797d1fef91ba870cc547785779.tar.gz tm-scripts-0ad37c4ff65131797d1fef91ba870cc547785779.tar.xz tm-scripts-0ad37c4ff65131797d1fef91ba870cc547785779.zip | |
[vmchooser] Fix config variable naming
| -rw-r--r-- | remote/modules/vmchooser/vmchooser.build | 10 | ||||
| -rw-r--r-- | remote/modules/vmchooser/vmchooser.conf | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/remote/modules/vmchooser/vmchooser.build b/remote/modules/vmchooser/vmchooser.build index 7d78f508..9a9d6d63 100644 --- a/remote/modules/vmchooser/vmchooser.build +++ b/remote/modules/vmchooser/vmchooser.build @@ -1,14 +1,14 @@ #!/bin/bash fetch_source() { - git clone "${GIT}" src + git clone "${REQUIRED_GIT}" src } build() { - SRCDIR="${MODULE_DIR}/src/" + local SRCDIR="${MODULE_DIR}/src/" - [ ! -d "${MODULE_BUILD_DIR}/${PREFIX}" ] && mkdir -p "${MODULE_BUILD_DIR}/${PREFIX}" - cd "${MODULE_BUILD_DIR}/${PREFIX}" + [ ! -d "${MODULE_BUILD_DIR}/${REQUIRED_PREFIX}" ] && mkdir -p "${MODULE_BUILD_DIR}/${REQUIRED_PREFIX}" + cd "${MODULE_BUILD_DIR}/${REQUIRED_PREFIX}" # patch globals.cpp and globals.h to use standardised paths /opt/openslx/... sed -i 's/^#define VMCHOOSER_BIN_PATH.*/#define VMCHOOSER_BIN_PATH "\/opt\/openslx\/bin"/g' "${SRCDIR}"/src/globals.h @@ -22,7 +22,7 @@ build() { sed -i 's/^#define VMCHOOSER_VMPATH.*/#define VMCHOOSER_VMPATH "\/mnt\/vmstore"/g' "${SRCDIR}"/src/globals.h pinfo "Running cmake" - cmake $CMAKE_ARGS $SRCDIR || perror "'cmake $CMAKE_ARGS $SRCDIR' failed." + cmake "$SRCDIR" || perror "'cmake $SRCDIR' failed." make || perror "'make' failed." cd - &> /dev/null diff --git a/remote/modules/vmchooser/vmchooser.conf b/remote/modules/vmchooser/vmchooser.conf index 182d65a0..686eb8bf 100644 --- a/remote/modules/vmchooser/vmchooser.conf +++ b/remote/modules/vmchooser/vmchooser.conf @@ -1,3 +1,3 @@ -GIT=git://git.openslx.org/openslx/tools/vmchooser.git -PREFIX="/opt/openslx/bin" +REQUIRED_GIT="git://git.openslx.org/openslx/tools/vmchooser.git" +REQUIRED_PREFIX="/opt/openslx/bin" REQUIRED_BINARIES="vmchooser" |