Use PORTABLE_EXECUTABLE_DIR to determine if we're in portable mode #1349
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
-const fileContent = fs.readFileSync(appConfig, 'utf-8')
- .replace(
- /const portable = (?:false|true)/,
- `const portable = ${JSON.stringify(action === 'do')}`
- )
-
-fs.writeFileSync(appConfig, fileContent)
diff --git a/package.json b/package.json
index 81f7a532..38a5f8be 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
"pack": "npm run build && electron-builder --dir",
"dist-ci": "version-unchanged || npm run dist",
"dist": "electron-builder --publish=onTagOrDraft",
- "dist-portable": "node bin/prepare-build-portable && electron-builder --win portable --linux AppImage && node bin/prepare-build-portable undo",
+ "dist-portable": "electron-builder --win portable --linux AppImage",
"build": "npm run build-css && npm run build-js && npm run build-translations",
"build-css": "node-sass scss/manifest.scss static/main.css",
"build-js": "webpack --mode=development --progress --profile --colors",
diff --git a/src/application-config.js b/src/application-config.js
index be2a08f2..725068f1 100644
--- a/src/application-config.js
+++ b/src/application-config.js
@@ -1,14 +1,12 @@
const appConfig = require('application-config')('DeltaChat')
const path = require('path')
-const portable = false
-
if (process.env.TEST_DIR) {
appConfig.filePath = path.join(process.env.TEST_DIR, 'config.json')
-} else if (portable) {
+} else if (process.env.PORTABLE_EXECUTABLE_DIR) {
/* ignore-console-log */
- console.log('Running in Portable Mode', process.cwd())
- appConfig.filePath = path.join(process.cwd(), 'DeltaChatData', 'config.json')
+ console.log('Running in Portable Mode', process.env.PORTABLE_EXECUTABLE_DIR)
+ appConfig.filePath = path.join(process.env.PORTABLE_EXECUTABLE_DIR, 'DeltaChatData', 'config.json')
}
module.exports = Object.freeze(appConfig)
Simon-Laux
approved these changes
Jan 15, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1315