Skip to content

refactor: use explicit cmd args and cwd files #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 12, 2025
Merged

refactor: use explicit cmd args and cwd files #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78698b9
refactor(capabilities): shell: explicit command args
xendarboh Feb 12, 2025
aed0c7b
refactor: execute commands using cwd file paths
xendarboh Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 3 additions & 15 deletions src-tauri/capabilities/default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,9 @@
"identifier": "shell:allow-execute",
"allow": [
{
"name": "chmod+x",
"name": "chmod-walletshield",
"cmd": "chmod",
"args": [
"+x",
{
"validator": "\\S+"
}
],
"args": ["+x", "walletshield"],
"sidecar": false
}
]
Expand All @@ -55,14 +50,7 @@
{
"name": "walletshield-listen",
"cmd": "walletshield",
"args": [
"-listen",
":7070",
"-config",
{
"validator": "\\S+"
}
],
"args": ["-listen", ":7070", "-config", "client.toml"],
"sidecar": false
}
]
Expand Down
14 changes: 9 additions & 5 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,14 @@ function App() {
// prepare the walletshield binary for execution
////////////////////////////////////////////////////////////////////////
if (platform() === "linux" || platform() === "macos") {
const output = await Command.create("chmod+x", [
"+x",
fileWalletshield,
]).execute();
log.debug(`executing command: chmod +x walletshield`);
const output = await Command.create(
"chmod-walletshield",
["+x", "walletshield"],
{
cwd: dirNetwork,
},
).execute();
if (output.code !== 0) {
throw new Error(`Failed to chmod+x walletshield: ${output.stderr}`);
}
Expand All @@ -181,7 +185,7 @@ function App() {
setMsgType(() => "info");
setMsg(() => `Starting network client...`);
const cmd = "walletshield";
const args = ["-listen", ":7070", "-config", fileClientCfg];
const args = ["-listen", ":7070", "-config", "client.toml"];
const command = Command.create("walletshield-listen", args, {
cwd: dirNetwork,
env: {
Expand Down