diff options
| author | Jonathan Bauer | 2015-02-02 15:20:20 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2015-02-02 15:20:20 +0100 |
| commit | 2d5ecd5c47ab2509f515537e6dbfa050e77060d6 (patch) | |
| tree | fe18a0437368e932f7c702fe2b66c4cb5bde5707 /server | |
| parent | [doc] minor doc changes (diff) | |
| download | tm-scripts-2d5ecd5c47ab2509f515537e6dbfa050e77060d6.tar.gz tm-scripts-2d5ecd5c47ab2509f515537e6dbfa050e77060d6.tar.xz tm-scripts-2d5ecd5c47ab2509f515537e6dbfa050e77060d6.zip | |
[export_target] stronger check to see if we have conflicting files from different config.tgz modules
Diffstat (limited to 'server')
| -rwxr-xr-x | server/export_target | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/export_target b/server/export_target index d930b8ee..33e06ad2 100755 --- a/server/export_target +++ b/server/export_target @@ -102,7 +102,7 @@ generate_config() { for FILE in $(find . -type f | cut -c 3-); do # check for all the archives we find in TARGET_CONFIG_BUILD_DIR for ARCHIV in $(ls "${TARGET_CONFIG_BUILD_DIR}/"*.tar 2>/dev/null); do - if [ "x$(tar tvf "${ARCHIV}" | grep "$FILE")" != "x" ]; then + if [ "x$(tar tvf "${ARCHIV}" | grep -E "${FILE}$")" != "x" ]; then # name of the module in conflict local CONFLICTING_MODULE="$(basename ${ARCHIV%.tar})" # file is present in archiv |