diff --git a/main/actions.js b/main/actions.js index e205515c..45b17628 100644 --- a/main/actions.js +++ b/main/actions.js @@ -1,11 +1,17 @@ const { Ooniprobe } = require('./utils/ooni/ooniprobe') +const { getAutorunHomeDir } = require('./utils/paths') const log = require('electron-log') const Sentry = require('@sentry/electron') const hardReset = () => { - const ooni = new Ooniprobe() + const ooniHome = new Ooniprobe() + const ooniAutorunHome = new Ooniprobe() log.info('hardReset: performing a hard reset of the installation') - return ooni.call(['reset', '--force']) + + return Promise.all([ + ooniHome.call(['reset', '--force']), + ooniAutorunHome.call(['reset', '--force'], {'OONI_HOME': getAutorunHomeDir()}) + ]) } const listMeasurements = (resultID) => { diff --git a/main/utils/ooni/ooniprobe.js b/main/utils/ooni/ooniprobe.js index 60ff30bc..654ae9ee 100644 --- a/main/utils/ooni/ooniprobe.js +++ b/main/utils/ooni/ooniprobe.js @@ -45,7 +45,7 @@ class Ooniprobe extends EventEmitter { this.ooni.stdin.end() } - call(argv) { + call(argv, env) { const self = this if (self.ooni !== null) { throw Error('can only use call once per instance. Create a new Oooniprobe object!') @@ -61,7 +61,8 @@ class Ooniprobe extends EventEmitter { 'OONI_HOME': getHomeDir(), // See https://github.com/ooni/probe-cli/pull/111 for documentation // concerning the design of killing ooniprobe portably - 'OONI_STDIN_EOF_IMPLIES_SIGTERM': 'true' + 'OONI_STDIN_EOF_IMPLIES_SIGTERM': 'true', + ...env, } } if (is.windows) {