Skip to content

Commit

Permalink
proper fix for disabling sandbox on steamos (#206)
Browse files Browse the repository at this point in the history
Co-authored-by: Vendicated <[email protected]>
  • Loading branch information
AAGaming00 and Vendicated authored Nov 1, 2023
1 parent 9521c28 commit b245354
Show file tree
Hide file tree
Showing 3 changed files with 77 additions and 2 deletions.
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
"package.json",
"LICENSE"
],
"beforePack": "scripts/build/sandboxFix.js",
"linux": {
"icon": "build/icon.icns",
"category": "Network",
Expand Down
74 changes: 74 additions & 0 deletions scripts/build/sandboxFix.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
/*
* SPDX-License-Identifier: GPL-3.0
* Vesktop, a desktop app aiming to give you a snappier Discord Experience
* Copyright (c) 2023 Vendicated and Vencord contributors
*/

// Based on https://github.com/gergof/electron-builder-sandbox-fix/blob/master/lib/index.js

const fs = require("fs/promises");
const path = require("path");
let isApplied = false;

const hook = async () => {
if (isApplied) return;
isApplied = true;
if (process.platform !== "linux") {
// this fix is only required on linux
return;
}
const AppImageTarget = require("app-builder-lib/out/targets/AppImageTarget");
const oldBuildMethod = AppImageTarget.default.prototype.build;
AppImageTarget.default.prototype.build = async function (...args) {
console.log("Running AppImage builder hook", args);
const oldPath = args[0];
const newPath = oldPath + "-appimage-sandbox-fix";
// just in case
try {
await fs.rm(newPath, {
recursive: true
});
} catch {}

console.log("Copying to apply appimage fix", oldPath, newPath);
await fs.cp(oldPath, newPath, {
recursive: true
});
args[0] = newPath;

const executable = path.join(newPath, this.packager.executableName);

const loaderScript = `
#!/usr/bin/env bash
SCRIPT_DIR="$( cd "$( dirname "\${BASH_SOURCE[0]}" )" && pwd )"
IS_STEAMOS=0
if [[ "$SteamOS" == "1" && "$SteamGamepadUI" == "1" ]]; then
echo "Running Vesktop on SteamOS, disabling sandbox"
IS_STEAMOS=1
fi
exec "$SCRIPT_DIR/${this.packager.executableName}.bin" "$([ "$IS_STEAMOS" == 1 ] && echo '--no-sandbox')" "$@"
`.trim();

try {
await fs.rename(executable, executable + ".bin");
await fs.writeFile(executable, loaderScript);
await fs.chmod(executable, 0o755);
} catch (e) {
console.error("failed to create loder for sandbox fix: " + e.message);
throw new Error("Failed to create loader for sandbox fix");
}

const ret = await oldBuildMethod.apply(this, args);

await fs.rm(newPath, {
recursive: true
});

return ret;
};
};

module.exports = hook;
4 changes: 2 additions & 2 deletions src/main/utils/steamOS.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

import { exec as callbackExec } from "child_process";
import { BrowserWindow, dialog } from "electron";
import { sleep } from "shared/utils/sleep";
import { promisify } from "util";

import { sleep } from "../../shared/utils/sleep";
import { MessageBoxChoice } from "../constants";
import { Settings } from "../settings";

Expand Down Expand Up @@ -50,7 +50,7 @@ async function showLayout(appId: string) {
await execSteamURL(`steam://controllerconfig/${appId}/${layoutId}`);
// because the UI doesn't consistently reload after the data for the config has loaded...
// HOW HAS NOBODY AT VALVE RUN INTO THIS YET
await sleep(300);
await sleep(100);
await execSteamURL(`steam://controllerconfig/${appId}/${layoutId}`);
}

Expand Down

0 comments on commit b245354

Please sign in to comment.