BlockStorage/repertory-ui
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix dependency installation on OS X

Browse Source
This commit is contained in:
Scott E. Graves
2019-04-06 07:43:46 -05:00
parent e410483a08
commit 4b5a0725bd
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
electron.js
View File

@@ -113,7 +113,7 @@ function createWindow() {
}); });
const appPath = (os.platform() === 'win32') ? path.resolve(path.join(app.getAppPath(), '..\\..\\repertory-ui.exe')) : const appPath = (os.platform() === 'win32') ? path.resolve(path.join(app.getAppPath(), '..\\..\\repertory-ui.exe')) :
(os.platform() === 'darwin') ? app.getAppPath() : (os.platform() === 'darwin') ? path.resolve(path.join(path.dirname(app.getAppPath()), '../MacOS/repertory-ui')) :
process.env.APPIMAGE; process.env.APPIMAGE;
const autoLauncher = new AutoLaunch({ const autoLauncher = new AutoLaunch({
@@ -277,21 +277,25 @@ ipcMain.on(Constants.IPC_Check_Dependency_Installed, (event, data) => {
try { try {
const exists = fs.lstatSync(data.File).isFile(); const exists = fs.lstatSync(data.File).isFile();
standardIPCReply(event, Constants.IPC_Check_Dependency_Installed_Reply, { standardIPCReply(event, Constants.IPC_Check_Dependency_Installed_Reply, {
data: {
Exists: exists, Exists: exists,
},
}); });
} catch (e) { } catch (e) {
standardIPCReply(event, Constants.IPC_Check_Dependency_Installed_Reply, { standardIPCReply(event, Constants.IPC_Check_Dependency_Installed_Reply, {
data : {
Exists: false, Exists: false,
}, e); },
});
} }
}); });
ipcMain.on(Constants.IPC_Check_Dependency_Installed + '_sync', (event, data) => { ipcMain.on(Constants.IPC_Check_Dependency_Installed + '_sync', (event, data) => {
try { try {
const exists = fs.lstatSync(data.File).isFile(); const ls = fs.lstatSync(data.File);
event.returnValue = { event.returnValue = {
data: { data: {
Exists: exists Exists: ls.isFile() || ls.isSymbolicLink(),
}, },
}; };
} catch (e) { } catch (e) {
@@ -589,7 +593,7 @@ ipcMain.on(Constants.IPC_Grab_UI_Releases, (event) => {
ipcMain.on(Constants.IPC_Install_Dependency, (event, data) => { ipcMain.on(Constants.IPC_Install_Dependency, (event, data) => {
if (data.Source.toLowerCase().endsWith('.dmg')) { if (data.Source.toLowerCase().endsWith('.dmg')) {
helpers helpers
.executeAsync('hdiutil', ['attach', data.Source]) .executeAsync('open', ['-a', 'Finder', '-W', data.Source])
.then(() => { .then(() => {
standardIPCReply(event, Constants.IPC_Install_Dependency_Reply, { standardIPCReply(event, Constants.IPC_Install_Dependency_Reply, {
Source: data.Source, Source: data.Source,

1
package.json
View File

@@ -38,7 +38,6 @@
"fs-extra": "3.0.1", "fs-extra": "3.0.1",
"html-webpack-plugin": "2.29.0", "html-webpack-plugin": "2.29.0",
"jest": "20.0.4", "jest": "20.0.4",
"mac-open": "^0.1.3",
"node-schedule": "^1.3.1", "node-schedule": "^1.3.1",
"npm": "^6.6.0", "npm": "^6.6.0",
"object-assign": "4.1.1", "object-assign": "4.1.1",

4
src/App.js
View File

@@ -545,9 +545,11 @@ class App extends IPCContainer {
const ret = this.sendSyncRequest(Constants.IPC_Check_Dependency_Installed, { const ret = this.sendSyncRequest(Constants.IPC_Check_Dependency_Installed, {
File: dep.file, File: dep.file,
}); });
if (ret.data.Exists || !ret.data.Success) { if (ret.data.Exists) {
clearInterval(i); clearInterval(i);
setTimeout(() => {
this.checkVersionInstalled(); this.checkVersionInstalled();
}, 10000);
} }
}, 3000); }, 3000);
}; };