Compare commits

...
3 Commits
4 changed files with 46 additions and 10 deletions
+2 -2
View File
@@ -1,12 +1,12 @@
{ {
"name": "mrterm", "name": "mrterm",
"version": "0.4.0", "version": "0.4.1",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "mrterm", "name": "mrterm",
"version": "0.4.0", "version": "0.4.1",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@xterm/addon-fit": "^0.11.0", "@xterm/addon-fit": "^0.11.0",
+1 -1
View File
@@ -1,7 +1,7 @@
{ {
"name": "mrterm", "name": "mrterm",
"productName": "MrTerm", "productName": "MrTerm",
"version": "0.4.0", "version": "0.4.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",
+3 -1
View File
@@ -24,7 +24,9 @@ if [[ "$version" != "$current" ]]; then
git add package.json package-lock.json git add package.json package-lock.json
git commit -m "Version ${version}" git commit -m "Version ${version}"
fi fi
git push origin HEAD # Push mit dem Gitea-Token (Basic-Auth, Benutzer aus GITEA_USER, Standard MrBlake)
auth="$(printf '%s:%s' "${GITEA_USER:-MrBlake}" "$GITEA_TOKEN" | base64 -w0)"
git -c http.extraHeader="Authorization: Basic ${auth}" push origin HEAD
rm -rf dist rm -rf dist
npm run dist:linux npm run dist:linux
+39 -5
View File
@@ -7,6 +7,39 @@ const os = require('os');
const path = require('path'); const path = require('path');
const i18n = require('../i18n'); const i18n = require('../i18n');
// Startet ein Programm und liefert den Exit-Code ('ENOENT', falls es nicht existiert)
function run(cmd, args) {
return new Promise((resolve) => {
const p = spawn(cmd, args, { stdio: 'ignore' });
p.on('error', (e) => resolve(e.code === 'ENOENT' ? 'ENOENT' : e.message));
p.on('exit', (c) => resolve(c));
});
}
// Fallback ohne Polkit-Agent: pacman -U per sudo in einem Terminalfenster; wartet, bis das Fenster geschlossen ist.
// Der Erfolg wird über eine Marker-Datei erkannt, da nicht jedes Terminal den Exit-Code durchreicht.
async function installInTerminal(file) {
const q = (s) => `'${String(s).replace(/'/g, `'\\''`)}'`;
const marker = file + '.ok';
try { fs.unlinkSync(marker); } catch {}
const script = `sudo /usr/bin/pacman -U --noconfirm ${q(file)} && touch ${q(marker)} || { echo; read -rp "[Enter]"; }`;
const terms = [
['konsole', ['--nofork', '-e', 'bash', '-c', script]],
['gnome-terminal', ['--wait', '--', 'bash', '-c', script]],
['kitty', ['bash', '-c', script]],
['alacritty', ['-e', 'bash', '-c', script]],
['foot', ['bash', '-c', script]],
['xfce4-terminal', ['--disable-server', '-x', 'bash', '-c', script]],
['xterm', ['-e', 'bash', '-c', script]],
];
for (const [cmd, args] of terms) {
const c = await run(cmd, args);
if (c === 'ENOENT') continue;
return fs.existsSync(marker) ? 0 : c || 1;
}
return 'ENOENT';
}
const DEFAULT_REPO ='https://git.mrblake.cc/MrBlake/MrTerm'; const DEFAULT_REPO ='https://git.mrblake.cc/MrBlake/MrTerm';
function parseRepo(url) { function parseRepo(url) {
@@ -134,11 +167,12 @@ class Updater {
app.relaunch({ execPath: target }); app.relaunch({ execPath: target });
app.exit(0); app.exit(0);
} else if (kind === 'pacman' && /\.(pacman|pkg\.tar\.zst)$/.test(file)) { } else if (kind === 'pacman' && /\.(pacman|pkg\.tar\.zst)$/.test(file)) {
await new Promise((resolve, reject) => { // 1. pkexec (grafische Passwortabfrage über den Polkit-Agent)
const p = spawn('pkexec', ['pacman', '-U', '--noconfirm', file], { stdio: 'ignore' }); let code = await run('pkexec', ['/usr/bin/pacman', '-U', '--noconfirm', file]);
p.on('error', reject); // 126/127 = Abfrage abgebrochen bzw. kein Polkit-Agent → Terminal mit sudo öffnen
p.on('exit', (c) => (c === 0 ? resolve() : reject(new Error(i18n.t('pacman exited with code {code}', { code: c }))))); if (code === 126 || code === 127 || code === 'ENOENT') code = await installInTerminal(file);
}); if (code === 'ENOENT') throw new Error(i18n.t('Automatic installation is not possible here. The file is located at: {file}', { file }));
if (code !== 0) throw new Error(i18n.t('pacman exited with code {code}', { code }));
app.relaunch(); app.relaunch();
app.exit(0); app.exit(0);
} else { } else {