mirror of
https://github.com/Equicord/Equicord.git
synced 2025-06-08 14:13:01 -04:00
Add support for Flatpak for Git updating (#274)
Co-authored-by: Ven <vendicated@riseup.net>
This commit is contained in:
parent
41dddc9eee
commit
62b2acebe6
2 changed files with 40 additions and 10 deletions
|
@ -39,6 +39,7 @@ const {
|
|||
getDarwinDirs,
|
||||
getLinuxDirs,
|
||||
ENTRYPOINT,
|
||||
question
|
||||
} = require("./common");
|
||||
|
||||
switch (process.platform) {
|
||||
|
@ -62,15 +63,14 @@ async function install(installations) {
|
|||
// Attempt to give flatpak perms
|
||||
if (selected.isFlatpak) {
|
||||
try {
|
||||
const { branch } = selected;
|
||||
const cwd = process.cwd();
|
||||
const globalCmd = `flatpak override ${branch} --filesystem=${cwd}`;
|
||||
const userCmd = `flatpak override --user ${branch} --filesystem=${cwd}`;
|
||||
const globalCmd = `flatpak override ${selected.branch} --filesystem=${cwd}`;
|
||||
const userCmd = `flatpak override --user ${selected.branch} --filesystem=${cwd}`;
|
||||
const cmd = selected.location.startsWith("/home")
|
||||
? userCmd
|
||||
: globalCmd;
|
||||
execSync(cmd);
|
||||
console.log("Successfully gave write perms to Discord Flatpak.");
|
||||
console.log("Gave write perms to Discord Flatpak.");
|
||||
} catch (e) {
|
||||
console.log("Failed to give write perms to Discord Flatpak.");
|
||||
console.log(
|
||||
|
@ -79,6 +79,29 @@ async function install(installations) {
|
|||
);
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
const answer = await question(
|
||||
`Would you like to allow ${selected.branch} to talk to org.freedesktop.Flatpak?\n` +
|
||||
"This is essentially full host access but necessary to spawn git. Without it, the updater will not work\n" +
|
||||
"Consider using the http based updater (using the gui installer) instead if you want to maintain the sandbox.\n" +
|
||||
"[y/N]: "
|
||||
);
|
||||
|
||||
if (["y", "yes", "yeah"].includes(answer.toLowerCase())) {
|
||||
try {
|
||||
const globalCmd = `flatpak override ${selected.branch} --talk-name=org.freedesktop.Flatpak`;
|
||||
const userCmd = `flatpak override --user ${selected.branch} --talk-name=org.freedesktop.Flatpak`;
|
||||
const cmd = selected.location.startsWith("/home")
|
||||
? userCmd
|
||||
: globalCmd;
|
||||
execSync(cmd);
|
||||
console.log("Sucessfully gave talk permission");
|
||||
} catch (err) {
|
||||
console.error("Failed to give talk permission\n", err);
|
||||
}
|
||||
} else {
|
||||
console.log(`Not giving full host access. If you change your mind later, you can run:\nflatpak override ${selected.branch} --talk-name=org.freedesktop.Flatpak`);
|
||||
}
|
||||
}
|
||||
|
||||
for (const version of selected.versions) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue