Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
20506ee889 | ||
|
|
6ebdc5126f |
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "mrterm",
|
"name": "mrterm",
|
||||||
"version": "0.17.0",
|
"version": "0.17.1",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "mrterm",
|
"name": "mrterm",
|
||||||
"version": "0.17.0",
|
"version": "0.17.1",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@xterm/addon-fit": "^0.11.0",
|
"@xterm/addon-fit": "^0.11.0",
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "mrterm",
|
"name": "mrterm",
|
||||||
"productName": "MrTerm",
|
"productName": "MrTerm",
|
||||||
"version": "0.17.0",
|
"version": "0.17.1",
|
||||||
"description": "Moderner SSH-, SFTP- und RDP-Client",
|
"description": "Moderner SSH-, SFTP- und RDP-Client",
|
||||||
"main": "src/main/main.js",
|
"main": "src/main/main.js",
|
||||||
"author": "MrBlake",
|
"author": "MrBlake",
|
||||||
|
|||||||
+4
-1
@@ -164,7 +164,10 @@ class DockerManager {
|
|||||||
async readStack(id, file) {
|
async readStack(id, file) {
|
||||||
const s = this.get(id);
|
const s = this.get(id);
|
||||||
const f = absPath(file);
|
const f = absPath(file);
|
||||||
const r = await this.sh(s, `cat ${q(f)} && printf '\\n\\0' && { cat ${q(dirname(f) + '/.env')} 2>/dev/null || true; }`);
|
// .env wird mit umask 077 geschrieben – beim Speichern per sudo gehört sie root. Dann scheitert cat mit
|
||||||
|
// „Permission denied“ und sh() wiederholt das Lesen per sudo (vorher wurde der Fehler verschluckt).
|
||||||
|
const env = q(dirname(f) + '/.env');
|
||||||
|
const r = await this.sh(s, `cat ${q(f)} && printf '\\n\\0' && { [ ! -e ${env} ] || cat ${env}; }`);
|
||||||
if (r.code) throw new Error(lastLine(r.err) || i18n.t('Could not read {file}', { file: f }));
|
if (r.code) throw new Error(lastLine(r.err) || i18n.t('Could not read {file}', { file: f }));
|
||||||
const i = r.out.lastIndexOf('\n\0');
|
const i = r.out.lastIndexOf('\n\0');
|
||||||
return { compose: r.out.slice(0, i), env: r.out.slice(i + 2) };
|
return { compose: r.out.slice(0, i), env: r.out.slice(i + 2) };
|
||||||
|
|||||||
Reference in New Issue
Block a user