From e8e93f39e2a93a09156b0e79a24d789454884c9c Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Fri, 16 Mar 2018 13:31:17 +0100 Subject: [PATCH] create-profile.sh: make detection of the default_content module more robust Do not just grep on "$ENABLED_MODULES" which is a comma-separated list on which is harder to match for the exact module name. Use instead the output of pm-list which has one module name for each line, this way it is easier to match for the exact name of "default_content" and avoid picking up other modules which may contain the string "default_content" in their names. --- libexec/create-profile.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/create-profile.sh b/libexec/create-profile.sh index 62a5b01..370963d 100755 --- a/libexec/create-profile.sh +++ b/libexec/create-profile.sh @@ -136,7 +136,7 @@ find "${PROFILE_DEST_DIR}/config/install" -type f -exec sed -i -e '/^_core: { } #fdupes -f -1 "${WEB_ROOT}/core/profiles/standard/config/install/" "${PROFILE_DEST_DIR}/config/install/" | xargs rm # Export the default content if the default_content module is there -if echo "$ENABLED_MODULES" | grep -q default_content; +if $DRUSH pm-list --type=module --field=name --status=enabled --pipe | grep -q "^default_content$"; then $DRUSH default-content-export-references --folder="${PROFILE_DEST_DIR}/content" node fi -- 2.1.4