diff options
| author | Michael Neves | 2013-02-28 15:00:24 +0100 |
|---|---|---|
| committer | Michael Neves | 2013-02-28 15:00:24 +0100 |
| commit | e4e4261fbb5fce8e2f2a612fc303bb366200b0f3 (patch) | |
| tree | a4757ccec8ad9f07dd9bf8f40e8fb8e2da6135da /remote/setup_tools | |
| parent | small fixes (diff) | |
| parent | Generalization: (diff) | |
| download | tm-scripts-e4e4261fbb5fce8e2f2a612fc303bb366200b0f3.tar.gz tm-scripts-e4e4261fbb5fce8e2f2a612fc303bb366200b0f3.tar.xz tm-scripts-e4e4261fbb5fce8e2f2a612fc303bb366200b0f3.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Conflicts:
helper/fileutil.inc
remote/tools/base/base.build
Diffstat (limited to 'remote/setup_tools')
| -rwxr-xr-x | remote/setup_tools | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/remote/setup_tools b/remote/setup_tools index e96d8e2c..2af8abe5 100755 --- a/remote/setup_tools +++ b/remote/setup_tools @@ -27,12 +27,19 @@ read_config () unset REQUIRED_FILES unset REQUIRED_MODULES unset REQUIRED_PACKAGES + unset REQUIRED_DEPENDENCIES local TOOL_CONFIG="${TOOL_DIR}/${TOOL}/${TOOL}.conf" - [ ! -e "${TOOL_CONFIG}" ] && perror "Config for '$TOOL' not found." - - . "${TOOL_CONFIG}" || perror "Sourcing '${TOOL_CONFIG}' failed." + if [ -e "${TOOL_CONFIG}.${PACKET_MANAGER}" ]; then + # a specific tool.conf seems to exist, try to use that one + # TODO: Maybe move this down right after loading the generic one, to allow "overloading".... but might be a bit confusing + . "${TOOL_CONFIG}.${PACKET_MANAGER}" || perror "Sourcing '${TOOL_CONFIG}.${PACKET_MANAGER}' failed." + else + # otherwise, use the generic one + [ ! -e "${TOOL_CONFIG}" ] && perror "Config for '$TOOL' not found." + . "${TOOL_CONFIG}" || perror "Sourcing '${TOOL_CONFIG}' failed." + fi } read_build () |