Skip to content

fix: back up the stylesheet next to it, and don't copy read-only permissions #584

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

Open
mattchristenson wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: back up the stylesheet next to it, and don't copy read-only permissions #584

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 39 additions & 6 deletions lib/shared/theme.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,17 +196,50 @@ export class ThemeManagerBase extends GObject.Object {
if (this._needUpdate()) {
let originalCss = this.configMgr.defaultStylesheetFile;
let configCss = this.configMgr.stylesheetFile;
let copyConfigCss = Gio.File.new_for_path(this.configMgr.stylesheetFileName + ".bak");
let backupFine = configCss.copy(copyConfigCss, Gio.FileCopyFlags.OVERWRITE, null, null);
let copyFine = originalCss.copy(configCss, Gio.FileCopyFlags.OVERWRITE, null, null);
if (backupFine && copyFine) {
this.settings.set_uint("css-last-update", this.cssTag);
return true;
if (!originalCss || !configCss) return false;
// The backup goes next to the user's stylesheet (it went to "undefined.bak" in the
// working directory, #266)
let copyConfigCss = Gio.File.new_for_path(`${configCss.get_path()}.bak`);
try {
let backupFine = this._copyFile(configCss, copyConfigCss);
let copyFine = this._copyFile(originalCss, configCss);
if (backupFine && copyFine) {
this.settings.set_uint("css-last-update", this.cssTag);
return true;
}
} catch (e) {
console.warn(`Forge: can't update the stylesheet ${configCss.get_path()}: ${e.message}`);
}
}
return false;
}

/**
* Copies `source` over `target`. The copy gets the usual permissions of a new file, not those
* of `source`: the extension's own files can be read-only (e.g. on NixOS), and a read-only copy
* couldn't be overwritten at the next update (#266). A read-only copy left by an earlier
* version is replaced.
* @param {Gio.File} source
* @param {Gio.File} target
*/
_copyFile(source, target) {
const flags = Gio.FileCopyFlags.OVERWRITE | Gio.FileCopyFlags.TARGET_DEFAULT_PERMS;
try {
return source.copy(target, flags, null, null);
} catch (e) {
// (only a target that exists and is read-only: not when the source can't be read)
const readOnlyTarget =
e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.PERMISSION_DENIED) &&
target.query_exists(null) &&
!target
.query_info("access::can-write", Gio.FileQueryInfoFlags.NONE, null)
.get_attribute_boolean("access::can-write");
if (!readOnlyTarget) throw e;
target.delete(null);
return source.copy(target, flags, null, null);
}
}

/**
* Credits: ExtensionSystem.js:_callExtensionEnable()
*/
Expand Down