From 34d7baf15fc413a28cffb1db861b74d6be1b2901 Mon Sep 17 00:00:00 2001 From: shmyga Date: Thu, 14 Mar 2019 21:15:43 +0300 Subject: [PATCH] [deb] copy app icon --- haxetool/project.js | 6 ++++-- package.json | 2 +- template/linux/app.desktop | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/haxetool/project.js b/haxetool/project.js index 143d5b7..74f6bcd 100644 --- a/haxetool/project.js +++ b/haxetool/project.js @@ -184,11 +184,13 @@ class LinuxDEBPacker extends Packer { call() { const target = this.targetPath; const buildDir = path.join(os.tmpdir(), 'build', this.config.name, 'debian'); + const iconfile = `${this.config.meta.filename}${path.extname(this.config.meta.icon)}`; const desktopTemplate = template(fs.readFileSync(path.resolve(__dirname, '..', 'template/linux/app.desktop'))); - const desktop = desktopTemplate(this.config); + const desktop = desktopTemplate(Object.assign({iconfile:iconfile}, this.config)); fse.ensureDirSync(`${buildDir}/usr/share/applications`); fs.writeFileSync(`${buildDir}/usr/share/applications/${this.config.meta.filename}.desktop`, desktop); fse.copySync(`${target}`, `${buildDir}/usr/share/${this.config.meta.filename}/`); + fse.copySync(this.config.meta.icon, `${buildDir}/usr/share/${this.config.meta.filename}/${iconfile}`); return gulp.src(`${buildDir}/*`) .pipe(deb({ package: this.config.meta.filename, @@ -426,4 +428,4 @@ Project.Builder = Builder; Project.Runner = Runner; -module.exports = Project; \ No newline at end of file +module.exports = Project; diff --git a/package.json b/package.json index 96da599..5c28e7f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gulp-haxetool", - "version": "0.0.14", + "version": "0.0.15", "description": "HaXe Tool for Gulp", "main": "index.js", "dependencies": { diff --git a/template/linux/app.desktop b/template/linux/app.desktop index 65e1012..a7de7a5 100644 --- a/template/linux/app.desktop +++ b/template/linux/app.desktop @@ -3,7 +3,7 @@ Encoding=UTF-8 Type=Application Comment=<%=meta.title%> <%=meta.version%> Exec=bash -c 'cd "/usr/share/<%=meta.filename%>" && ./<%=meta.filename%>' -Icon=/usr/share/<%=meta.filename%>/<%=meta.icon%> +Icon=/usr/share/<%=meta.filename%>/<%=iconfile%> Name=<%=meta.title%> Categories=Game Terminal=false