refactor: remove shelljs dependency (#842)

Co-authored-by: エリス <erisu@users.noreply.github.com>
2026-05-11 00:00:05 +08:00 · 2020-01-28 21:12:55 -04:00
parent dee1e77d0b
commit 3712619f5c
20 changed files with 702 additions and 511 deletions
@@ -264,45 +264,23 @@ module.exports.findBestApkForArchitecture = function (buildResults, arch) {
 };

 function PackageInfo (keystore, alias, storePassword, password, keystoreType) {
-    this.keystore = {
-        'name': 'key.store',
-        'value': keystore
-    };
-    this.alias = {
-        'name': 'key.alias',
-        'value': alias
-    };
-    if (storePassword) {
-        this.storePassword = {
-            'name': 'key.store.password',
-            'value': storePassword
-        };
-    }
-    if (password) {
-        this.password = {
-            'name': 'key.alias.password',
-            'value': password
-        };
-    }
-    if (keystoreType) {
-        this.keystoreType = {
-            'name': 'key.store.type',
-            'value': keystoreType
-        };
-    }
+    const createNameKeyObject = (name, value) => ({ name, value: value.replace(/\\/g, '\\\\') });
+
+    this.data = [
+        createNameKeyObject('key.store', keystore),
+        createNameKeyObject('key.alias', alias)
+    ];
+
+    if (storePassword) this.data.push(createNameKeyObject('key.store.password', storePassword));
+    if (password) this.data.push(createNameKeyObject('key.alias.password', password));
+    if (keystoreType) this.data.push(createNameKeyObject('key.store.type', keystoreType));
 }

 PackageInfo.prototype = {
-    toProperties: function () {
-        var self = this;
-        var result = '';
-        Object.keys(self).forEach(function (key) {
-            result += self[key].name;
-            result += '=';
-            result += self[key].value.replace(/\\/g, '\\\\');
-            result += '\n';
-        });
-        return result;
+    appendToProperties: function (propertiesParser) {
+        for (const { name, value } of this.data) propertiesParser.set(name, value);
+
+        propertiesParser.save();
    }
 };

@@ -17,15 +17,15 @@
       under the License.
 */

-var fs = require('fs');
+var fs = require('fs-extra');
 var path = require('path');
-var shell = require('shelljs');
 const execa = require('execa');
 var events = require('cordova-common').events;
 var CordovaError = require('cordova-common').CordovaError;
 var check_reqs = require('../check_reqs');
 var PackageType = require('../PackageType');
 const compareFunc = require('compare-func');
+const { createEditor } = require('properties-parser');

 const MARKER = 'YOUR CHANGES WILL BE ERASED!';
 const SIGNING_PROPERTIES = '-signing.properties';
@@ -33,6 +33,67 @@ const TEMPLATE =
    '# This file is automatically generated.\n' +
    '# Do not modify this file -- ' + MARKER + '\n';

+const fileSorter = compareFunc([
+    // Sort arch specific builds after generic ones
+    filePath => /-x86|-arm/.test(filePath),
+
+    // Sort unsigned builds after signed ones
+    filePath => /-unsigned/.test(filePath),
+
+    // Sort by file modification time, latest first
+    filePath => -fs.statSync(filePath).mtime.getTime(),
+
+    // Sort by file name length, ascending
+    'length'
+]);
+
+/**
+ * If the provided directory does not exist or extension is missing, return an empty array.
+ * If the director exists, loop the directories and collect list of files matching the extension.
+ *
+ * @param {String} dir Directory to scan
+ * @param {String} extension
+ */
+function recursivelyFindFiles (dir, extension) {
+    if (!fs.existsSync(dir) || !extension) return [];
+
+    const files = fs.readdirSync(dir, { withFileTypes: true })
+        .map(entry => {
+            const item = path.resolve(dir, entry.name);
+
+            if (entry.isDirectory()) return recursivelyFindFiles(item, extension);
+            if (path.extname(entry.name) === `.${extension}`) return item;
+            return false;
+        });
+
+    return Array.prototype.concat(...files)
+        .filter(file => file !== false);
+}
+
+/**
+ * @param {String} dir
+ * @param {String} build_type
+ * @param {String} arch
+ * @param {String} extension
+ */
+function findOutputFilesHelper (dir, build_type, arch, extension) {
+    let files = recursivelyFindFiles(path.resolve(dir, build_type), extension);
+
+    if (files.length === 0) return files;
+
+    // Assume arch-specific build if newest apk has -x86 or -arm.
+    let archSpecific = !!/-x86|-arm/.exec(path.basename(files[0]));
+
+    // And show only arch-specific ones (or non-arch-specific)
+    files = files.filter(p => !!/-x86|-arm/.exec(path.basename(p)) === archSpecific);
+
+    if (archSpecific && files.length > 1 && arch) {
+        files = files.filter(p => path.basename(p).indexOf('-' + arch) !== -1);
+    }
+
+    return files;
+}
+
 class ProjectBuilder {
    constructor (rootDirectory) {
        this.root = rootDirectory || path.resolve(__dirname, '../../..');
@@ -131,7 +192,7 @@ class ProjectBuilder {
            try {
                fs.accessSync(subProjectGradle, fs.F_OK);
            } catch (e) {
-                shell.cp('-f', pluginBuildGradle, subProjectGradle);
+                fs.copySync(pluginBuildGradle, subProjectGradle);
            }
        };

@@ -221,22 +282,25 @@ class ProjectBuilder {
                return self.runGradleWrapper(gradlePath);
            }).then(function () {
                return self.prepBuildFiles();
-            }).then(function () {
-                // If the gradle distribution URL is set, make sure it points to version we want.
-                // If it's not set, do nothing, assuming that we're using a future version of gradle that we don't want to mess with.
-                // For some reason, using ^ and $ don't work.  This does the job, though.
-                var distributionUrlRegex = /distributionUrl.*zip/;
-                var distributionUrl = process.env['CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL'] || 'https\\://services.gradle.org/distributions/gradle-6.1-all.zip';
-                var gradleWrapperPropertiesPath = path.join(self.root, 'gradle', 'wrapper', 'gradle-wrapper.properties');
-                shell.chmod('u+w', gradleWrapperPropertiesPath);
-                shell.sed('-i', distributionUrlRegex, 'distributionUrl=' + distributionUrl, gradleWrapperPropertiesPath);
+            }).then(() => {
+                // update/set the distributionUrl in the gradle-wrapper.properties
+                const gradleWrapperPropertiesPath = path.join(self.root, 'gradle/wrapper/gradle-wrapper.properties');
+                const gradleWrapperProperties = createEditor(gradleWrapperPropertiesPath);
+                const distributionUrl = process.env['CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL'] || 'https://services.gradle.org/distributions/gradle-6.1-all.zip';
+                gradleWrapperProperties.set('distributionUrl', distributionUrl);
+                gradleWrapperProperties.save();

-                var propertiesFile = opts.buildType + SIGNING_PROPERTIES;
-                var propertiesFilePath = path.join(self.root, propertiesFile);
+                events.emit('verbose', `Gradle Distribution URL: ${distributionUrl}`);
+            })
+            .then(() => {
+                const signingPropertiesPath = path.join(self.root, `${opts.buildType}${SIGNING_PROPERTIES}`);
+
+                if (fs.existsSync(signingPropertiesPath)) fs.removeSync(signingPropertiesPath);
                if (opts.packageInfo) {
-                    fs.writeFileSync(propertiesFilePath, TEMPLATE + opts.packageInfo.toProperties());
-                } else if (isAutoGenerated(propertiesFilePath)) {
-                    shell.rm('-f', propertiesFilePath);
+                    fs.ensureFileSync(signingPropertiesPath);
+                    const signingProperties = createEditor(signingPropertiesPath);
+                    signingProperties.addHeadComment(TEMPLATE);
+                    opts.packageInfo.appendToProperties(signingProperties);
                }
            });
    }
@@ -263,28 +327,29 @@ class ProjectBuilder {
    }

    clean (opts) {
-        var builder = this;
-        var wrapper = path.join(this.root, 'gradlew');
-        var args = builder.getArgs('clean', opts);
+        const wrapper = path.join(this.root, 'gradlew');
+        const args = this.getArgs('clean', opts);
        return execa(wrapper, args, { stdio: 'inherit' })
-            .then(function () {
-                shell.rm('-rf', path.join(builder.root, 'out'));
+            .then(() => {
+                fs.removeSync(path.join(this.root, 'out'));

-                ['debug', 'release'].forEach(function (config) {
-                    var propertiesFilePath = path.join(builder.root, config + SIGNING_PROPERTIES);
-                    if (isAutoGenerated(propertiesFilePath)) {
-                        shell.rm('-f', propertiesFilePath);
-                    }
-                });
+                ['debug', 'release'].map(config => path.join(this.root, `${config}${SIGNING_PROPERTIES}`))
+                    .forEach(file => {
+                        const hasFile = fs.existsSync(file);
+                        const hasMarker = hasFile && fs.readFileSync(file, 'utf8')
+                            .includes(MARKER);
+
+                        if (hasFile && hasMarker) fs.removeSync(file);
+                    });
            });
    }

    findOutputApks (build_type, arch) {
-        return findOutputApksHelper(this.apkDir, build_type, arch).sort(apkSorter);
+        return findOutputFilesHelper(this.apkDir, build_type, arch, 'apk').sort(fileSorter);
    }

    findOutputBundles (build_type) {
-        return findOutputBundlesHelper(this.aabDir, build_type);
+        return findOutputFilesHelper(this.aabDir, build_type, false, 'aab').sort(fileSorter);
    }

    fetchBuildResults (build_type, arch) {
@@ -296,93 +361,3 @@ class ProjectBuilder {
 }

 module.exports = ProjectBuilder;
-
-const apkSorter = compareFunc([
-    // Sort arch specific builds after generic ones
-    apkPath => /-x86|-arm/.test(apkPath),
-
-    // Sort unsigned builds after signed ones
-    apkPath => /-unsigned/.test(apkPath),
-
-    // Sort by file modification time, latest first
-    apkPath => -fs.statSync(apkPath).mtime.getTime(),
-
-    // Sort by file name length, ascending
-    'length'
-]);
-
-function findOutputApksHelper (dir, build_type, arch) {
-    var shellSilent = shell.config.silent;
-    shell.config.silent = true;
-
-    // list directory recursively
-    var ret = shell.ls('-R', dir).map(function (file) {
-        // ls does not include base directory
-        return path.join(dir, file);
-    }).filter(function (file) {
-        // find all APKs
-        return file.match(/\.apk?$/i);
-    }).filter(function (candidate) {
-        var apkName = path.basename(candidate);
-        // Need to choose between release and debug .apk.
-        if (build_type === 'debug') {
-            return /-debug/.exec(apkName) && !/-unaligned|-unsigned/.exec(apkName);
-        }
-        if (build_type === 'release') {
-            return /-release/.exec(apkName) && !/-unaligned/.exec(apkName);
-        }
-        return true;
-    }).sort(apkSorter);
-
-    shell.config.silent = shellSilent;
-
-    if (ret.length === 0) {
-        return ret;
-    }
-    // Assume arch-specific build if newest apk has -x86 or -arm.
-    var archSpecific = !!/-x86|-arm/.exec(path.basename(ret[0]));
-    // And show only arch-specific ones (or non-arch-specific)
-    ret = ret.filter(function (p) {
-        return !!/-x86|-arm/.exec(path.basename(p)) === archSpecific;
-    });
-
-    if (archSpecific && ret.length > 1 && arch) {
-        ret = ret.filter(function (p) {
-            return path.basename(p).indexOf('-' + arch) !== -1;
-        });
-    }
-
-    return ret;
-}
-
-// This method was a copy of findOutputApksHelper and modified to look for bundles
-// While replacing shell with fs-extra, it might be a good idea to see if we can
-// generalise these findOutput methods.
-function findOutputBundlesHelper (dir, build_type) {
-    const shellSilent = shell.config.silent;
-    shell.config.silent = true;
-
-    // list directory recursively
-    const ret = shell.ls('-R', dir).map(function (file) {
-        return path.join(dir, file); // ls does not include base directory
-    }).filter(function (file) {
-        return file.match(/\.aab?$/i); // find all bundles
-    }).filter(function (candidate) {
-        // Need to choose between release and debug bundle.
-        if (build_type === 'debug') {
-            return /debug/.exec(candidate);
-        }
-        if (build_type === 'release') {
-            return /release/.exec(candidate);
-        }
-        return true;
-    });
-
-    shell.config.silent = shellSilent;
-
-    return ret;
-}
-
-function isAutoGenerated (file) {
-    return fs.existsSync(file) && fs.readFileSync(file, 'utf8').indexOf(MARKER) > 0;
-}
@@ -20,10 +20,10 @@
 */

 const execa = require('execa');
-var shelljs = require('shelljs');
 var path = require('path');
-var fs = require('fs');
+var fs = require('fs-extra');
 var os = require('os');
+var which = require('which');
 var REPO_ROOT = path.join(__dirname, '..', '..', '..', '..');
 var PROJECT_ROOT = path.join(__dirname, '..', '..');
 const { CordovaError, ConfigParser, events } = require('cordova-common');
@@ -31,11 +31,25 @@ var android_sdk = require('./android_sdk');
 const { createEditor } = require('properties-parser');

 function forgivingWhichSync (cmd) {
-    try {
-        return fs.realpathSync(shelljs.which(cmd));
-    } catch (e) {
-        return '';
+    let whichResult = which.sync(cmd, { nothrow: true });
+
+    // On null, returns empty string to maintain backwards compatibility
+    // realpathSync follows symlinks
+    return whichResult === null ? '' : fs.realpathSync(whichResult);
+}
+
+function getJDKDirectory (directory) {
+    let p = path.resolve(directory, 'java');
+    if (fs.existsSync(p)) {
+        let directories = fs.readdirSync(p);
+        for (let i = 0; i < directories.length; i++) {
+            let dir = directories[i];
+            if (/^(jdk)+./.test(dir)) {
+                return path.resolve(directory, 'java', dir);
+            }
+        }
    }
+    return null;
 }

 module.exports.isWindows = function () {
@@ -182,7 +196,6 @@ module.exports.check_java = function () {
                    });
                } else {
                    // See if we can derive it from javac's location.
-                    // fs.realpathSync is require on Ubuntu, which symplinks from /usr/bin -> JDK
                    var maybeJavaHome = path.dirname(path.dirname(javacPath));
                    if (fs.existsSync(path.join(maybeJavaHome, 'lib', 'tools.jar'))) {
                        process.env['JAVA_HOME'] = maybeJavaHome;
@@ -191,16 +204,16 @@ module.exports.check_java = function () {
                    }
                }
            } else if (module.exports.isWindows()) {
-                // Try to auto-detect java in the default install paths.
-                var oldSilent = shelljs.config.silent;
-                shelljs.config.silent = true;
-                var firstJdkDir =
-                    shelljs.ls(process.env['ProgramFiles'] + '\\java\\jdk*')[0] ||
-                    shelljs.ls('C:\\Program Files\\java\\jdk*')[0] ||
-                    shelljs.ls('C:\\Program Files (x86)\\java\\jdk*')[0];
-                shelljs.config.silent = oldSilent;
+                const programFilesEnv = path.resolve(process.env['ProgramFiles']);
+                const programFiles = 'C:\\Program Files\\';
+                const programFilesx86 = 'C:\\Program Files (x86)\\';
+
+                let firstJdkDir =
+                    getJDKDirectory(programFilesEnv) ||
+                    getJDKDirectory(programFiles) ||
+                    getJDKDirectory(programFilesx86);
+
                if (firstJdkDir) {
-                    // shelljs always uses / in paths.
                    firstJdkDir = firstJdkDir.replace(/\//g, path.sep);
                    if (!javacPath) {
                        process.env['PATH'] += path.delimiter + path.join(firstJdkDir, 'bin');
@@ -20,6 +20,7 @@
 */

 const execa = require('execa');
+const fs = require('fs-extra');
 var android_versions = require('android-versions');
 var retry = require('./retry');
 var build = require('./build');
@@ -28,27 +29,25 @@ var Adb = require('./Adb');
 var AndroidManifest = require('./AndroidManifest');
 var events = require('cordova-common').events;
 var CordovaError = require('cordova-common').CordovaError;
-var shelljs = require('shelljs');
 var android_sdk = require('./android_sdk');
 var check_reqs = require('./check_reqs');
-
+var which = require('which');
 var os = require('os');
-var fs = require('fs');

 // constants
-var ONE_SECOND = 1000; // in milliseconds
-var ONE_MINUTE = 60 * ONE_SECOND; // in milliseconds
-var INSTALL_COMMAND_TIMEOUT = 5 * ONE_MINUTE; // in milliseconds
-var NUM_INSTALL_RETRIES = 3;
-var CHECK_BOOTED_INTERVAL = 3 * ONE_SECOND; // in milliseconds
-var EXEC_KILL_SIGNAL = 'SIGKILL';
+const ONE_SECOND = 1000; // in milliseconds
+const ONE_MINUTE = 60 * ONE_SECOND; // in milliseconds
+const INSTALL_COMMAND_TIMEOUT = 5 * ONE_MINUTE; // in milliseconds
+const NUM_INSTALL_RETRIES = 3;
+const CHECK_BOOTED_INTERVAL = 3 * ONE_SECOND; // in milliseconds
+const EXEC_KILL_SIGNAL = 'SIGKILL';

 function forgivingWhichSync (cmd) {
-    try {
-        return fs.realpathSync(shelljs.which(cmd));
-    } catch (e) {
-        return '';
-    }
+    let whichResult = which.sync(cmd, { nothrow: true });
+
+    // On null, returns empty string to maintain backwards compatibility
+    // realpathSync follows symlinks
+    return whichResult === null ? '' : fs.realpathSync(whichResult);
 }

 module.exports.list_images_using_avdmanager = function () {
@@ -290,7 +289,7 @@ module.exports.start = function (emulator_ID, boot_timeout) {
        return self.get_available_port().then(function (port) {
            // Figure out the directory the emulator binary runs in, and set the cwd to that directory.
            // Workaround for https://code.google.com/p/android/issues/detail?id=235461
-            var emulator_dir = path.dirname(shelljs.which('emulator'));
+            var emulator_dir = path.dirname(which.sync('emulator'));
            var args = ['-avd', emulatorId, '-port', port];
            // Don't wait for it to finish, since the emulator will probably keep running for a long time.
            execa('emulator', args, { stdio: 'inherit', detached: true, cwd: emulator_dir })
@@ -14,9 +14,8 @@
 *
 */

-var fs = require('fs');
+var fs = require('fs-extra');
 var path = require('path');
-var shell = require('shelljs');
 var events = require('cordova-common').events;
 var CordovaError = require('cordova-common').CordovaError;

@@ -42,7 +41,7 @@ var handlers = {
                deleteJava(project.projectDir, dest);
            } else {
                // Just remove the file, not the whole parent directory
-                removeFile(project.projectDir, dest);
+                removeFile(path.resolve(project.projectDir, dest));
            }
        }
    },
@@ -53,7 +52,7 @@ var handlers = {
        },
        uninstall: function (obj, plugin, project, options) {
            var dest = path.join('app/libs', path.basename(obj.src));
-            removeFile(project.projectDir, dest);
+            removeFile(path.resolve(project.projectDir, dest));
        }
    },
    'resource-file': {
@@ -63,7 +62,7 @@ var handlers = {
        },
        uninstall: function (obj, plugin, project, options) {
            var dest = path.join('app', 'src', 'main', obj.target);
-            removeFile(project.projectDir, dest);
+            removeFile(path.resolve(project.projectDir, dest));
        }
    },
    'framework': {
@@ -102,7 +101,7 @@ var handlers = {

            if (obj.custom) {
                var subRelativeDir = project.getCustomSubprojectRelativeDir(plugin.id, src);
-                removeFile(project.projectDir, subRelativeDir);
+                removeFile(path.resolve(project.projectDir, subRelativeDir));
                subDir = path.resolve(project.projectDir, subRelativeDir);
                // If it's the last framework in the plugin, remove the parent directory.
                var parDir = path.dirname(subDir);
@@ -143,12 +142,12 @@ var handlers = {

            if (!target) throw new CordovaError(generateAttributeError('target', 'asset', plugin.id));

-            removeFileF(path.resolve(project.www, target));
-            removeFileF(path.resolve(project.www, 'plugins', plugin.id));
+            removeFile(path.resolve(project.www, target));
+            removeFile(path.resolve(project.www, 'plugins', plugin.id));
            if (options && options.usePlatformWww) {
                // CB-11022 remove file from both directories if usePlatformWww is specified
-                removeFileF(path.resolve(project.platformWww, target));
-                removeFileF(path.resolve(project.platformWww, 'plugins', plugin.id));
+                removeFile(path.resolve(project.platformWww, target));
+                removeFile(path.resolve(project.platformWww, 'plugins', plugin.id));
            }
        }
    },
@@ -166,13 +165,13 @@ var handlers = {
            scriptContent = 'cordova.define("' + moduleName + '", function(require, exports, module) {\n' + scriptContent + '\n});\n';

            var wwwDest = path.resolve(project.www, 'plugins', plugin.id, obj.src);
-            shell.mkdir('-p', path.dirname(wwwDest));
+            fs.ensureDirSync(path.dirname(wwwDest));
            fs.writeFileSync(wwwDest, scriptContent, 'utf-8');

            if (options && options.usePlatformWww) {
                // CB-11022 copy file to both directories if usePlatformWww is specified
                var platformWwwDest = path.resolve(project.platformWww, 'plugins', plugin.id, obj.src);
-                shell.mkdir('-p', path.dirname(platformWwwDest));
+                fs.ensureDirSync(path.dirname(platformWwwDest));
                fs.writeFileSync(platformWwwDest, scriptContent, 'utf-8');
            }
        },
@@ -217,14 +216,11 @@ function copyFile (plugin_dir, src, project_dir, dest, link) {
    // check that dest path is located in project directory
    if (dest.indexOf(project_dir) !== 0) { throw new CordovaError('Destination "' + dest + '" for source file "' + src + '" is located outside the project'); }

-    shell.mkdir('-p', path.dirname(dest));
+    fs.ensureDirSync(path.dirname(dest));
    if (link) {
        symlinkFileOrDirTree(src, dest);
-    } else if (fs.statSync(src).isDirectory()) {
-        // XXX shelljs decides to create a directory when -R|-r is used which sucks. http://goo.gl/nbsjq
-        shell.cp('-Rf', src + '/*', dest);
    } else {
-        shell.cp('-f', src, dest);
+        fs.copySync(src, dest);
    }
 }

@@ -238,11 +234,11 @@ function copyNewFile (plugin_dir, src, project_dir, dest, link) {

 function symlinkFileOrDirTree (src, dest) {
    if (fs.existsSync(dest)) {
-        shell.rm('-Rf', dest);
+        fs.removeSync(dest);
    }

    if (fs.statSync(src).isDirectory()) {
-        shell.mkdir('-p', dest);
+        fs.ensureDirSync(path.dirname(dest));
        fs.readdirSync(src).forEach(function (entry) {
            symlinkFileOrDirTree(path.join(src, entry), path.join(dest, entry));
        });
@@ -251,15 +247,8 @@ function symlinkFileOrDirTree (src, dest) {
    }
 }

-// checks if file exists and then deletes. Error if doesn't exist
-function removeFile (project_dir, src) {
-    var file = path.resolve(project_dir, src);
-    shell.rm('-Rf', file);
-}
-
-// deletes file/directory without checking
-function removeFileF (file) {
-    shell.rm('-Rf', file);
+function removeFile (file) {
+    fs.removeSync(file);
 }

 // Sometimes we want to remove some java, and prune any unnecessary empty directories
@@ -272,7 +261,7 @@ function removeFileAndParents (baseDir, destFile, stopper) {
    var file = path.resolve(baseDir, destFile);
    if (!fs.existsSync(file)) return;

-    removeFileF(file);
+    removeFile(file);

    // check if directory is empty
    var curDir = path.dirname(file);
@@ -17,9 +17,8 @@
    under the License.
 */

-var fs = require('fs');
+var fs = require('fs-extra');
 var path = require('path');
-var shell = require('shelljs');
 var events = require('cordova-common').events;
 var AndroidManifest = require('./AndroidManifest');
 var checkReqs = require('./check_reqs');
@@ -30,6 +29,7 @@ var FileUpdater = require('cordova-common').FileUpdater;
 var PlatformJson = require('cordova-common').PlatformJson;
 var PlatformMunger = require('cordova-common').ConfigChanges.PlatformMunger;
 var PluginInfoProvider = require('cordova-common').PluginInfoProvider;
+let utils = require('./utils');

 const GradlePropertiesParser = require('./config/GradlePropertiesParser');

@@ -120,7 +120,7 @@ function updateConfigFilesFrom (sourceConfig, configMunger, locations) {

    // First cleanup current config and merge project's one into own
    // Overwrite platform config.xml with defaults.xml.
-    shell.cp('-f', locations.defaultConfigXml, locations.configXml);
+    fs.copySync(locations.defaultConfigXml, locations.configXml);

    // Then apply config changes from global munge to all config files
    // in project (including project's config)
@@ -222,9 +222,10 @@ function updateProjectAccordingTo (platformConfig, locations) {
        .write();

    // Java file paths shouldn't be hard coded
-    var javaPattern = path.join(locations.javaSrc, manifestId.replace(/\./g, '/'), '*.java');
-    var java_files = shell.ls(javaPattern).filter(function (f) {
-        return shell.grep(/extends\s+CordovaActivity/g, f);
+    let javaDirectory = path.join(locations.javaSrc, manifestId.replace(/\./g, '/'));
+    let javaPattern = /\.java$/;
+    let java_files = utils.scanDirectory(javaDirectory, javaPattern, true).filter(function (f) {
+        return utils.grep(f, /extends\s+CordovaActivity/g) !== null;
    });

    if (java_files.length === 0) {
@@ -233,9 +234,15 @@ function updateProjectAccordingTo (platformConfig, locations) {
        events.emit('log', 'Multiple candidate Java files that extend CordovaActivity found. Guessing at the first one, ' + java_files[0]);
    }

-    var destFile = path.join(locations.root, 'app', 'src', 'main', 'java', androidPkgName.replace(/\./g, '/'), path.basename(java_files[0]));
-    shell.mkdir('-p', path.dirname(destFile));
-    shell.sed(/package [\w.]*;/, 'package ' + androidPkgName + ';', java_files[0]).to(destFile);
+    let destFile = java_files[0];
+
+    // var destFile = path.join(locations.root, 'app', 'src', 'main', 'java', androidPkgName.replace(/\./g, '/'), path.basename(java_files[0]));
+    // fs.ensureDirSync(path.dirname(destFile));
+    // events.emit('verbose', java_files[0]);
+    // events.emit('verbose', destFile);
+    // console.log(locations);
+    // fs.copySync(java_files[0], destFile);
+    utils.replaceFileContents(destFile, /package [\w.]*;/, 'package ' + androidPkgName + ';');
    events.emit('verbose', 'Wrote out Android package name "' + androidPkgName + '" to ' + destFile);

    var removeOrigPkg = checkReqs.isWindows() || checkReqs.isDarwin() ?
@@ -244,7 +251,7 @@ function updateProjectAccordingTo (platformConfig, locations) {

    if (removeOrigPkg) {
        // If package was name changed we need to remove old java with main activity
-        shell.rm('-Rf', java_files[0]);
+        fs.removeSync(java_files[0]);
        // remove any empty directories
        var currentDir = path.dirname(java_files[0]);
        var sourcesRoot = path.resolve(locations.root, 'src');
@@ -637,9 +644,10 @@ function cleanIcons (projectRoot, projectConfig, platformResourcesDir) {
 * Gets a map containing resources of a specified name from all drawable folders in a directory.
 */
 function mapImageResources (rootDir, subDir, type, resourceName) {
-    var pathMap = {};
-    shell.ls(path.join(rootDir, subDir, type + '-*')).forEach(function (drawableFolder) {
-        var imagePath = path.join(subDir, path.basename(drawableFolder), resourceName);
+    let pathMap = {};
+    let pattern = new RegExp(type + '+-.+');
+    utils.scanDirectory(path.join(rootDir, subDir), pattern).forEach(function (drawableFolder) {
+        let imagePath = path.join(subDir, path.basename(drawableFolder), resourceName);
        pathMap[imagePath] = null;
    });
    return pathMap;
@@ -0,0 +1,97 @@
+/*
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+*/
+
+/*
+    Provides a set of utility methods, which can also be spied on during unit tests.
+*/
+
+// TODO: Perhaps this should live in cordova-common?
+
+const fs = require('fs-extra');
+const path = require('path');
+
+/**
+ * Reads, searches, and replaces the found occurences with replacementString and then writes the file back out.
+ * A backup is not made.
+ *
+ * @param {string} file A file path to a readable & writable file
+ * @param {RegExp} searchRegex The search regex
+ * @param {string} replacementString The string to replace the found occurences
+ * @returns void
+ */
+exports.replaceFileContents = function (file, searchRegex, replacementString) {
+    let contents = fs.readFileSync(file).toString();
+    contents = contents.replace(searchRegex, replacementString);
+    fs.writeFileSync(file, contents);
+};
+
+/**
+ * Reads a file and scans for regex. Returns the line of the first occurence or null if no occurences are found.
+ *
+ * @param {string} file A file path
+ * @param {RegExp} regex A search regex
+ * @returns string|null
+ */
+exports.grep = function (file, regex) {
+    let contents = fs.readFileSync(file).toString().replace(/\\r/g, '').split('\n');
+    for (let i = 0; i < contents.length; i++) {
+        let line = contents[i];
+        if (regex.test(line)) {
+            return line;
+        }
+    }
+    return null;
+};
+
+/**
+ * Scans directories and outputs a list of found paths that matches the regex
+ *
+ * @param {string} directory The starting directory
+ * @param {RegExp} regex The search regex
+ * @param {boolean} recursive Enables recursion
+ * @returns Array<string>
+ */
+exports.scanDirectory = function (directory, regex, recursive) {
+    let output = [];
+
+    if (fs.existsSync(directory)) {
+        let items = fs.readdirSync(directory);
+
+        for (let i = 0; i < items.length; i++) {
+            let item = items[i];
+            let itemPath = path.join(directory, item);
+            let stats = fs.statSync(itemPath);
+
+            if (regex.test(itemPath)) {
+                output.push(itemPath);
+            }
+
+            if (stats.isDirectory()) {
+                if (recursive) {
+                    output = output.concat(exports.scanDirectory(itemPath, regex, recursive));
+                } else {
+                    // Move onto the next item
+                    continue;
+                }
+            }
+        }
+    }
+
+    return output;
+};