Copy dist contents, not dist itself. Display correct uppy.js location

This commit is contained in:
Kevin van Zonneveld 2016-04-07 18:48:35 +02:00
parent 9d549cc2ed
commit 1df4cf42ad
3 changed files with 2 additions and 5 deletions

3
.gitignore vendored
View file

@ -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

View file

@ -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"

View file

@ -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: '),