ExternalVendorCode/balena-supervisor
1
0
Fork 0
mirror of https://github.com/balena-os/balena-supervisor.git synced 2025-02-21 02:01:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Auto-merge for PR #434 via VersionBot

Browse Source 
Fix typo in how hostOSVersionPath was camel-cased
This commit is contained in:
resin-io-versionbot[bot] 2017-05-12 22:58:10 +00:00 committed by GitHub
commit 17e51f9153
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file
automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
This project adheres to [Semantic Versioning](http://semver.org/).
## v4.2.4 - 2017-05-12
* Fix typo in how hostOSVersionPath was camel-cased [Pablo Carranza Velez]
## v4.2.3 - 2017-05-11
* Properly handle errors when requesting deltas [Pablo Carranza Velez]

2
package.json
View File

@ -1,7 +1,7 @@
{
"name": "resin-supervisor",
"description": "This is resin.io's Supervisor, a program that runs on IoT devices and has the task of running user Apps (which are Docker containers), and updating them as Resin's API informs it to.",
"version": "4.2.3",
"version": "4.2.4",
"license": "Apache-2.0",
"repository": {
"type": "git",

2
src/config.coffee
View File

@ -26,7 +26,7 @@ module.exports =
api: checkString(process.env.RESIN_SUPERVISOR_SECRET) ? null
logsChannel: checkString(process.env.RESIN_SUPERVISOR_LOGS_CHANNEL) ? null
vpnStatusPath: checkString(process.env.VPN_STATUS_PATH) ? '/mnt/root/run/openvpn/vpn_status'
hostOsVersionPath: checkString(process.env.HOST_OS_VERSION_PATH) ? '/mnt/root/etc/os-release'
hostOSVersionPath: checkString(process.env.HOST_OS_VERSION_PATH) ? '/mnt/root/etc/os-release'
dockerRoot: dockerRoot
btrfsRoot: checkString(process.env.BTRFS_ROOT) ? "#{dockerRoot}/btrfs/subvolumes"
privateAppEnvVars: [

4
src/device.coffee
View File

@ -226,7 +226,7 @@ do ->
return
exports.getOSVersion = memoizePromise ->
osRelease.getOSVersion(config.hostOsVersionPath)
osRelease.getOSVersion(config.hostOSVersionPath)
exports.isResinOSv1 = memoizePromise ->
exports.getOSVersion().then (osVersion) ->
@ -234,4 +234,4 @@ exports.isResinOSv1 = memoizePromise ->
return false
exports.getOSVariant = memoizePromise ->
osRelease.getOSVariant(config.hostOsVersionPath)
osRelease.getOSVariant(config.hostOSVersionPath)

4
src/request.coffee
View File

@ -5,8 +5,8 @@ request = require 'request'
url = require 'url'
osRelease = require './lib/os-release'
osVersion = osRelease.getOSVersionSync(config.hostOsVersionPath)
osVariant = osRelease.getOSVariantSync(config.hostOsVersionPath)
osVersion = osRelease.getOSVersionSync(config.hostOSVersionPath)
osVariant = osRelease.getOSVariantSync(config.hostOSVersionPath)
supervisorVersion = require('./lib/supervisor-version')
userAgent = "Supervisor/#{supervisorVersion}"