Skip to content
This repository has been archived by the owner on Dec 23, 2023. It is now read-only.

Update Electron, fix #4, and fix #6 #10

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ First of all, **thank you** for contributing, **you are awesome**!

Here are a few rules to follow in order to ease code reviews, and discussions before maintainers accept and merge your work.

You MUST follow the [JavaScript Standard Style][https://www.npmjs.com/package/standard] conventions.
You MUST follow the [JavaScript Standard Style](https://www.npmjs.com/package/standard) conventions.

You MUST run the test suite.

Expand Down
9 changes: 4 additions & 5 deletions app/lib/auto-update/update.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
'use strict'

const os = require('os')
const platform = os.platform() + '_' + os.arch()

const { autoUpdater } = require('electron')

Expand All @@ -11,17 +10,17 @@ module.exports = function update (options) {
return
}

var updaterFeedUrl = options.url + platform + '/' + options.version
var updaterFeedUrl = options.url + os.platform() + '/' + options.version
if (os.platform() === 'win32') {
updaterFeedUrl += '/RELEASES'
}

console.info('Running version %s on platform %s', options.version, platform)
console.info('Running version %s on platform %s', options.version, os.platform())

try {
// Don't try to update on development
if (!process.execPath.match(/[\\\/]electron-prebuilt/)) {
console.info('Checking for updates at %s', updaterFeedUrl)
if (!process.execPath.match(/electron-prebuilt/)) {
console.log('Checking for updates at %s', updaterFeedUrl)
autoUpdater.setFeedURL(updaterFeedUrl)
autoUpdater.checkForUpdates()
}
Expand Down
146 changes: 146 additions & 0 deletions app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "SkelEktron",
"productName": "SkelEktron",
"description": "Electron Template Desktop Application",
"version": "0.0.6",
"version": "0.0.7",
"homepage": "https://github.com/BZCoding/SkelEktron",
"author": {
"name": "BZ Coding",
Expand All @@ -11,13 +11,13 @@
},
"license": "MIT",
"main": "main.js",
"electronVersion": "1.0.0",
"electronVersion": "1.7.10",
"dependencies": {
"devtron": "^1",
"electron-debug": "^1",
"electron-is-dev": "^0.1",
"electron-window-state": "^3",
"lodash": "^4"
"lodash": ">=4.17.5"
},
"config": {
"url": "index.html",
Expand Down
Loading