[cordova-android] branch master updated: fix(prepare): fix pattern used to collect image resources (#1084)

[ra...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

raphinesse pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-android.git


The following commit(s) were added to refs/heads/master by this push:
     new 2062388  fix(prepare): fix pattern used to collect image resources (#1084)
2062388 is described below

commit 206238893b66bbfd18a16f3e6b708480985edb38
Author: Raphael von der Grün <ra...@gmail.com>
AuthorDate: Tue Oct 6 08:38:09 2020 +0200

    fix(prepare): fix pattern used to collect image resources (#1084)
    
    The pattern contained an additional plus that slipped in during the
    refactoring done in #842. See [the diff][1] for details.
    
    [1]: https://github.com/apache/cordova-android/pull/842/commits/09e8248d1f0bbf5c833765e71dbf2343c38cc6bf#diff-26c51bfaa44eff1e46fd61ec3225ec13L640-R650
---
 bin/templates/cordova/lib/prepare.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/templates/cordova/lib/prepare.js b/bin/templates/cordova/lib/prepare.js
index 6e8e92f..cbe3fbe 100644
--- a/bin/templates/cordova/lib/prepare.js
+++ b/bin/templates/cordova/lib/prepare.js
@@ -664,7 +664,7 @@ function cleanIcons (projectRoot, projectConfig, platformResourcesDir) {
  */
 function mapImageResources (rootDir, subDir, type, resourceName) {
     const pathMap = {};
-    const pattern = new RegExp(type + '+-.+');
+    const pattern = new RegExp(type + '-.+');
     utils.scanDirectory(path.join(rootDir, subDir), pattern).forEach(function (drawableFolder) {
         const imagePath = path.join(subDir, path.basename(drawableFolder), resourceName);
         pathMap[imagePath] = null;


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org