uhk/agent
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix(device): use tmp path to run setup-rules.sh (#523)

Browse Source
This commit is contained in:
Róbert Kiss
2017-12-22 19:58:54 +01:00
committed by László Monda
parent 8bb9f7f839
commit 500ccc296b
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/uhk-agent/src/services/sudo.service.ts
View File

@@ -2,6 +2,8 @@ import { ipcMain, app } from 'electron';
import * as isDev from 'electron-is-dev'; import * as isDev from 'electron-is-dev';
import * as path from 'path'; import * as path from 'path';
import * as sudo from 'sudo-prompt'; import * as sudo from 'sudo-prompt';
import { dirSync } from 'tmp';
import { emptyDir, copy } from 'fs-extra';
import { IpcEvents, LogService, IpcResponse } from 'uhk-common'; import { IpcEvents, LogService, IpcResponse } from 'uhk-common';
@@ -18,10 +20,10 @@ export class SudoService {
ipcMain.on(IpcEvents.device.setPrivilegeOnLinux, this.setPrivilege.bind(this)); ipcMain.on(IpcEvents.device.setPrivilegeOnLinux, this.setPrivilege.bind(this));
} }
private setPrivilege(event: Electron.Event) { private async setPrivilege(event: Electron.Event) {
switch (process.platform) { switch (process.platform) {
case 'linux': case 'linux':
this.setPrivilegeOnLinux(event); await this.setPrivilegeOnLinux(event);
break; break;
default: default:
const response: IpcResponse = { const response: IpcResponse = {
@@ -34,14 +36,20 @@ export class SudoService {
} }
} }
private setPrivilegeOnLinux(event: Electron.Event) { private async setPrivilegeOnLinux(event: Electron.Event) {
const scriptPath = path.join(this.rootDir, 'rules/setup-rules.sh'); const tmpDirectory = dirSync();
const rulesDir = path.join(this.rootDir, 'rules');
this.logService.debug('[SudoService] Copy rules dir', { src: rulesDir, dst: tmpDirectory.name });
await copy(rulesDir, tmpDirectory.name);
const scriptPath = path.join(tmpDirectory.name, 'setup-rules.sh');
const options = { const options = {
name: 'Setting UHK access rules' name: 'Setting UHK access rules'
}; };
const command = `sh ${scriptPath}`; const command = `sh ${scriptPath}`;
this.logService.debug('[SudoService] Set privilege command: ', command); this.logService.debug('[SudoService] Set privilege command: ', command);
sudo.exec(command, options, (error: any) => { sudo.exec(command, options, async (error: any) => {
const response = new IpcResponse(); const response = new IpcResponse();
if (error) { if (error) {
@@ -52,6 +60,7 @@ export class SudoService {
response.success = true; response.success = true;
} }
await emptyDir(tmpDirectory.name);
event.sender.send(IpcEvents.device.setPrivilegeOnLinuxReply, response); event.sender.send(IpcEvents.device.setPrivilegeOnLinuxReply, response);
}); });
} }

2
packages/uhk-web/src/app/store/effects/device.ts
View File

@@ -88,7 +88,7 @@ export class DeviceEffects {
return [ return [
<any>new ShowNotificationAction({ <any>new ShowNotificationAction({
type: NotificationType.Error, type: NotificationType.Error,
message: response.error.message message: response.error.message || response.error
}) })
]; ];
}); });