Merge pull request #949 from afc163/master

update way of checking empty directory
spmjs · Aug 13, 2014 · 29d1142 · 29d1142
2 parents 0a16a71 + aaf3cdb
commit 29d1142
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/bin/spm-init b/bin/spm-init
@@ -54,11 +54,13 @@ runTask();
 */
 
 function runTask() {
-  if (file.list(process.cwd()).length > 0) {
+
+  if (!file.isEmptyDir(process.cwd())) {
     console.warn(color.yellow('Existing files here, please run init command in an empty folder!'));
     return;
   }
-  console.log('Will create a spm package: ');
+
+  console.log('Creating a spm package: ');
   inquirer.prompt([{
     message: 'Package name',
     name: 'name',

diff --git a/lib/sdk/file.js b/lib/sdk/file.js
@@ -149,6 +149,9 @@ file.require = function(item) {
   return module;
 };
 
+file.isEmptyDir = function(dir) {
+  return fs.readdirSync(dir).length <= 0;
+}
 
 function unixifyPath(filepath) {
   if (process.platform === 'win32') {