mirror naming

sw-yx · sw-yx · commit 4024dc55f5de · 2019-03-16T01:40:07.000-07:00
diff --git a/README.md b/README.md
@@ -45,9 +45,9 @@ netlify functions:create
 netlify functions:create hello-world
 netlify functions:create --name hello-world
 netlify functions:create hello-world --dir
-netlify functions:create --url https://github.com/netlify-labs/all-the-functions/tree/master/functions/9-using-middleware
+netlify functions:create hello-world --url https://github.com/netlify-labs/all-the-functions/tree/master/functions/9-using-middleware
 ```
 
 You can just call `netlify functions:create` and the prompts will guide you all the way, however you can also supply a first argument to name the function. By default it creates a single file, however you can also use a `--dir` flag to create a function as a directory.
 
-By passing a folder in a github repo to the `--url` flag, you can clone new templates. Dependencies are installed inside its own folder.
+By passing a URL to a folder in a github repo to the `--url` flag, you can clone new templates. Dependencies are installed inside its own folder. Example: `netlify functions:create hello-world --url https://github.com/netlify-labs/all-the-functions/tree/master/functions/9-using-middleware`
diff --git a/src/commands/functions/create.js b/src/commands/functions/create.js
@@ -32,7 +32,8 @@ class FunctionsCreateCommand extends Command {
       // // --url flag specified, download from there
       const folderContents = await readRepoURL(flags.url)
       const functionName = flags.url.split('/').slice(-1)[0]
-      const fnFolder = path.join(functionsDir, functionName)
+      const nameToUse = await getNameFromArgs(args, flags, functionName)
+      const fnFolder = path.join(functionsDir, nameToUse)
       if (fs.existsSync(fnFolder + '.js') && fs.lstatSync(fnFolder + '.js').isFile()) {
         this.log(`A single file version of the function ${name} already exists at ${fnFolder}.js`)
         process.exit(1)
@@ -46,14 +47,16 @@ class FunctionsCreateCommand extends Command {
       await Promise.all(
         folderContents.map(({ name, download_url }) => {
           return fetch(download_url).then(res => {
-            const dest = fs.createWriteStream(path.join(fnFolder, name))
+            const finalName = path.basename(name, '.js') === functionName ? nameToUse + '.js' : name
+            const dest = fs.createWriteStream(path.join(fnFolder, finalName))
             res.body.pipe(dest)
           })
         })
       )
 
-      cp.exec('npm i', { cwd: path.join(functionsDir, functionName) }, () => {
-        console.log(`${functionName} dependencies installed`)
+      console.log(`installing dependencies for ${nameToUse}...`)
+      cp.exec('npm i', { cwd: path.join(functionsDir, nameToUse) }, () => {
+        console.log(`installing dependencies for ${nameToUse} complete `)
       })
     } else {
       // // no --url flag specified, pick from a provided template
