From 1df4cf42ad9be0d9b25347e78c2a6e1f73049b82 Mon Sep 17 00:00:00 2001
From: Kevin van Zonneveld <kevin@vanzonneveld.net>
Date: Thu, 7 Apr 2016 18:48:35 +0200
Subject: [PATCH] Copy dist contents, not dist itself. Display correct uppy.js
 location

---
 .gitignore              | 3 ---
 bin/bootandkill-servers | 2 +-
 website/update.js       | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index dded16059..4115c7fca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,10 +14,7 @@ website/public/
 website/.deploy*/
 website/src/_drafts
 website/themes/uppy/source/uppy/
-
 npm-debug.log*
 website/themes/uppy/_config.yml
-
 config/
-
 nohup.out
diff --git a/bin/bootandkill-servers b/bin/bootandkill-servers
index b4d67ff4e..8753b4cfb 100755
--- a/bin/bootandkill-servers
+++ b/bin/bootandkill-servers
@@ -96,7 +96,7 @@ echo "[${__base}] --> and I don't know yet how to check for that"
 sleep ${buildWait}
 
 echo "[${__base}] --> Showing uppy.js builds and sizes"
-ls -al dist/uppy.js website/public/js/uppy.js website/themes/uppy/source/uppy/uppy.js || true
+ls -al dist/uppy.js website/public/uppy/uppy.js website/themes/uppy/source/uppy/uppy.js || true
 echo ""
 
 url="http://localhost:4000/uppy/uppy.js"
diff --git a/website/update.js b/website/update.js
index dcd2f6084..a446a404c 100644
--- a/website/update.js
+++ b/website/update.js
@@ -52,7 +52,7 @@ var saveConfig = Object.assign({}, defaultConfig, loadedConfig, scanConfig)
 fs.writeFileSync(configPath, YAML.safeDump(saveConfig), 'utf-8')
 console.info(chalk.green('✓ rewritten: '), chalk.dim(configPath))
 
-exec('cp -vfR ' + uppyRoot + '/dist/ ' + webRoot + '/themes/uppy/source/uppy', function (error, stdout, stderr) {
+exec('cp -vfR ' + uppyRoot + '/dist/* ' + webRoot + '/themes/uppy/source/uppy', function (error, stdout, stderr) {
   if (error) {
     console.error(
       chalk.red('x failed to inject: '),