Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.

Commit

Permalink
fix: convert Windows CRLF to Unix LF in bash files
Browse files Browse the repository at this point in the history
  • Loading branch information
ppoffice committed Mar 1, 2017
1 parent 47d1179 commit 593b1d2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
6 changes: 5 additions & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ var webpack = require('webpack');
var clean = require('gulp-clean');
var packager = require('electron-packager');
var childProcess = require('child_process');
var convertNewline = require("gulp-convert-newline");

var packageInfo = require('./package.json');
var webpackConfig = require('./webpack.config.js');
Expand All @@ -22,11 +23,14 @@ gulp.task('clean', function (callback) {
gulp.task('copy', function () {
gulp.src(['./src/browser.js', './src/app.config.js', './src/*.html'])
.pipe(gulp.dest('./app'));
gulp.src(['./src/assets/*', './src/assets/*/**'])
gulp.src(['./src/assets/*', './src/assets/*/**', '!./src/assets/scripts/*.sh'])
.pipe(gulp.dest('./app/assets'));
gulp.src(['./package.json']).pipe(gulp.dest('./app'));
gulp.src(['./node_modules/electron-sudo/src/bin/*', './node_modules/electron-sudo/src/bin/*/**'])
.pipe(gulp.dest('./app/bin'));
gulp.src('./src/assets/scripts/*.sh')
.pipe(convertNewline())
.pipe(gulp.dest('./app/assets/scripts'));
});

gulp.task('webpack', function (callback) {
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"electron-prebuilt": "^0.36.0",
"gulp": "^3.9.0",
"gulp-clean": "^0.3.1",
"gulp-convert-newline": "0.0.3",
"gulp-sass": "^2.1.1",
"gulp-util": "^3.0.7",
"json-loader": "^0.5.4",
Expand Down

0 comments on commit 593b1d2

Please sign in to comment.