other changes for linux
This commit is contained in:
parent
d329e4c2f9
commit
6470ea5546
1
build.js
1
build.js
@ -40,6 +40,7 @@ const options = {
|
|||||||
linux: {
|
linux: {
|
||||||
maintainer: 'Stratum',
|
maintainer: 'Stratum',
|
||||||
category: 'AudioVideo',
|
category: 'AudioVideo',
|
||||||
|
icon: 'public/favicon.icns',
|
||||||
desktop: {
|
desktop: {
|
||||||
StartupNotify: 'false',
|
StartupNotify: 'false',
|
||||||
Encoding: 'UTF-8',
|
Encoding: 'UTF-8',
|
||||||
|
BIN
public/favicon.icns
Normal file
BIN
public/favicon.icns
Normal file
Binary file not shown.
@ -15,6 +15,10 @@ export function getFFMPEGPath() {
|
|||||||
|
|
||||||
return { ffmpeg: ffmpeg, ffprobe: ffprobe }
|
return { ffmpeg: ffmpeg, ffprobe: ffprobe }
|
||||||
} else {
|
} else {
|
||||||
|
// Linux:
|
||||||
|
// const ffmpeg = path.join(ffmpegPath, 'ffmpeg')
|
||||||
|
// const ffprobe = path.join(ffmpegPath, 'ffprobe')
|
||||||
|
|
||||||
const ffmpeg = path.join(ffmpegPath, 'ffmpeg.exe')
|
const ffmpeg = path.join(ffmpegPath, 'ffmpeg.exe')
|
||||||
const ffprobe = path.join(ffmpegPath, 'ffprobe.exe')
|
const ffprobe = path.join(ffmpegPath, 'ffprobe.exe')
|
||||||
|
|
||||||
|
@ -14,6 +14,7 @@ export function getMP4DecryptPath() {
|
|||||||
|
|
||||||
return mp4Decrypt
|
return mp4Decrypt
|
||||||
} else {
|
} else {
|
||||||
|
// Linux: const mp4Decrypt = path.join(decryptPath, 'mp4decrypt').replace(/\s/g, '\\ ')
|
||||||
const mp4Decrypt = path.join(decryptPath, 'mp4decrypt.exe')
|
const mp4Decrypt = path.join(decryptPath, 'mp4decrypt.exe')
|
||||||
|
|
||||||
return mp4Decrypt
|
return mp4Decrypt
|
||||||
|
@ -23,6 +23,8 @@ function createWindow() {
|
|||||||
icon: __dirname + '/icon/favicon.ico',
|
icon: __dirname + '/icon/favicon.ico',
|
||||||
width: 950,
|
width: 950,
|
||||||
height: 700,
|
height: 700,
|
||||||
|
// Linux:
|
||||||
|
// backgroundColor: '#2222222',
|
||||||
webPreferences: {
|
webPreferences: {
|
||||||
devTools: true,
|
devTools: true,
|
||||||
nodeIntegration: true,
|
nodeIntegration: true,
|
||||||
@ -181,6 +183,8 @@ ipcMain.handle(
|
|||||||
icon: __dirname + '/icon/favicon.ico',
|
icon: __dirname + '/icon/favicon.ico',
|
||||||
width: opt.width,
|
width: opt.width,
|
||||||
height: opt.height,
|
height: opt.height,
|
||||||
|
// Linux:
|
||||||
|
// backgroundColor: '#2222222',
|
||||||
webPreferences: {
|
webPreferences: {
|
||||||
devTools: true,
|
devTools: true,
|
||||||
nodeIntegration: true,
|
nodeIntegration: true,
|
||||||
|
BIN
src/electron/icon/favicon.icns
Normal file
BIN
src/electron/icon/favicon.icns
Normal file
Binary file not shown.
Reference in New Issue
Block a user