ExternalVendorCode/gns3-web-ui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-web-ui.git synced 2024-12-20 21:43:06 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #243 from GNS3/windows-installation-improvements

Browse Source 
License view and ask for path to install on Windows, Fixes: #242, #241
This commit is contained in:
ziajka 2019-01-03 11:21:09 +01:00 committed by GitHub
commit f4fbfe1ed3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
electron-builder.yml
View File

@ -52,3 +52,6 @@ win:
nsis:
perMachine: true
oneClick: false
allowToChangeInstallationDirectory: true
license: "LICENSE"

8
main.js
View File

@ -48,6 +48,10 @@ const createServerProc = () => {
}
});
if (serverPath == null) {
console.error('gns3server cannot be found');
}
if (serverPath != null) {
serverProc = require('child_process').execFile(serverPath, []);
@ -113,8 +117,8 @@ function createWindow () {
// Some APIs can only be used after this event occurs.
app.on('ready', createWindow);
// app.on('ready', createServerProc);
// app.on('will-quit', exitServerProc);
app.on('ready', createServerProc);
app.on('will-quit', exitServerProc);
// Quit when all windows are closed.
app.on('window-all-closed', function () {

2
scripts/build.py
View File

@ -84,7 +84,7 @@ def download_command(arguments):
shutil.rmtree(SOURCE_DESTINATION, ignore_errors=True)
os.makedirs(SOURCE_DESTINATION)
download("https://github.com/GNS3/gns3-server/archive/2.1.zip", SOURCE_ZIP)
download("https://github.com/GNS3/gns3-server/archive/2.2.zip", SOURCE_ZIP)
files = unzip(SOURCE_ZIP, SOURCE_DESTINATION)
source_directory = os.path.join(SOURCE_DESTINATION, files[0].filename)