diff --git a/app-template/apply.js b/app-template/apply.js index 8654b1109..1aaee94de 100755 --- a/app-template/apply.js +++ b/app-template/apply.js @@ -23,8 +23,6 @@ var MakefileHeader = "# PLEASE! Do not edit this file directly \n# Modify var fs = require('fs-extra'); var path = require('path'); - - var configBlob = fs.readFileSync(configDir + '/appConfig.json', 'utf8'); var config = JSON.parse(configBlob, 'utf8'); @@ -60,13 +58,13 @@ Object.keys(templates).forEach(function(k) { process.exit(1); } - if(k === 'config-template.xml'){ + if (k === 'config-template.xml') { k = 'config.xml'; } else if (k === 'package-template.json') { k = 'package.json'; } - if (!fs.existsSync('../' + targetDir)){ + if (!fs.existsSync('../' + targetDir)) { fs.mkdirSync('../' + targetDir); } fs.writeFileSync('../' + targetDir + k, content, 'utf8'); @@ -83,9 +81,9 @@ try { var confName = configDir.toUpperCase(); var externalServicesConf = confName + '_EXTERNAL_SERVICES_CONFIG_LOCATION'; console.log('Looking for ' + externalServicesConf + '...'); - if(typeof process.env[externalServicesConf] !== 'undefined') { + if (typeof process.env[externalServicesConf] !== 'undefined') { var location = process.env[externalServicesConf] - if(location.charAt(0) === '~') { + if (location.charAt(0) === '~') { location = location.replace(/^\~/, process.env.HOME || process.env.USERPROFILE); } console.log('Found at: ' + location); @@ -94,50 +92,24 @@ try { } else { throw externalServicesConf + ' environment variable not set.'; } -} catch(err) { +} catch (err) { console.log(err); externalServices = '{}'; console.log('External services not configured'); } fs.writeFileSync('../externalServices.json', externalServices, 'utf8'); -function copyDir(from, to, cb) { +function copyDir(from, to) { console.log('Copying dir ' + from + ' to ' + to); if (fs.existsSync(to)) fs.removeSync(to); // remove previous app directory if (!fs.existsSync(from)) return; // nothing to do - var files = []; - fs.walk(from) - .on('data', function(item) { - if ((item.stats["mode"] & 0x4000)) { - - var tmp = item.path + '/'; - var l = tmp.length - from.length; - if (tmp.indexOf(from) == l) return; // #same dir - - } - if (item.path.indexOf('DS_Store') >= 0) return; - - if (!files.includes(path.dirname(item.path))) { - files.push(item.path); - } - }) - .on('end', function() { - files.forEach(function(i) { - console.log(' # ' + i); - fs.copySync(i, to + path.basename(i)); - }); - return cb(); - - }) - + fs.copySync(from, to); } // Push Notification fs.copySync(configDir + '/GoogleService-Info.plist', '../GoogleService-Info.plist'); fs.copySync(configDir + '/google-services.json', '../google-services.json'); -copyDir(configDir + '/img/', '../www/img/app/', function() { - copyDir(configDir + '/sass/', '../src/sass/app/', function() { - console.log("apply.js finished. \n\n"); - }); -}); +copyDir(configDir + '/img', '../www/img/app'); +copyDir(configDir + '/sass', '../src/sass/app'); +console.log("apply.js finished. \n\n");