diff options
Diffstat (limited to 'raveos-gnome-theme/theme-data/extensions/installed/customreboot@nova1545')
3 files changed, 16 insertions, 24 deletions
diff --git a/raveos-gnome-theme/theme-data/extensions/installed/customreboot@nova1545/extension.js b/raveos-gnome-theme/theme-data/extensions/installed/customreboot@nova1545/extension.js index 035e019..d1e07a4 100644 --- a/raveos-gnome-theme/theme-data/extensions/installed/customreboot@nova1545/extension.js +++ b/raveos-gnome-theme/theme-data/extensions/installed/customreboot@nova1545/extension.js @@ -22,7 +22,7 @@ class RebootQuickMenu extends QuickSettings.QuickMenuToggle { // Set toggle to be unchecked this.checked = false; - + // Open menu and set toggle check to true this.clickedID = this.connect("clicked", () => { this.menu.open(); @@ -33,14 +33,10 @@ class RebootQuickMenu extends QuickSettings.QuickMenuToggle { this.menuClosedID = this.menu.connect("menu-closed", () => { this.checked = false; }); - + // Add boot options to menu - try { - this.createBootMenu(extension); - } - catch (e) { - LogWarning(e); - } + this.createBootMenu(extension) + .catch((reason) => LogWarning(reason)); } cleanConns() { @@ -67,9 +63,9 @@ class RebootQuickMenu extends QuickSettings.QuickMenuToggle { // Add reload option, to refresh extension menu without reloading GNOME or the extension this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem()); - this.menu.addAction('Reload', () => { + this.menu.addAction('Reload', async () => { this.menu.removeAll(); - this.createBootMenu(); + await this.createBootMenu(extension).catch((reason) => LogWarning(reason)); }); // Add button to open settings @@ -102,9 +98,9 @@ class RebootQuickMenu extends QuickSettings.QuickMenuToggle { // Add reload option, to refresh extension menu without reloading GNOME or the extension this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem()); - this.menu.addAction('Reload', () => { + this.menu.addAction('Reload', async () => { this.menu.removeAll(); - this.createBootMenu(); + await this.createBootMenu(extension).catch((reason) => LogWarning(reason)); }); // Add button to open settings @@ -116,16 +112,16 @@ class RebootQuickMenu extends QuickSettings.QuickMenuToggle { if (!result) return; if (!await loader.QuickRebootEnabled()) { this.menu.addAction('Enable Quick Reboot', async () => { - await loader.EnableQuickReboot(extension); + await loader.EnableQuickReboot(extension).catch((reason) => LogWarning(reason)); this.menu.removeAll(); - this.createBootMenu(); + await this.createBootMenu(extension).catch((reason) => LogWarning(reason)); }); } else { this.menu.addAction('Disable Quick Reboot', async () => { await loader.DisableQuickReboot(); this.menu.removeAll(); - this.createBootMenu(); + await this.createBootMenu(extension).catch((reason) => LogWarning(reason)); }); } }); @@ -140,7 +136,7 @@ class RebootQuickMenu extends QuickSettings.QuickMenuToggle { this.menu.addAction('Fix Grub.conf Perms', async () => { await loader.SetReadable(); this.menu.removeAll(); - this.createBootMenu(extension); + await this.createBootMenu(extension); }); } }) @@ -148,7 +144,6 @@ class RebootQuickMenu extends QuickSettings.QuickMenuToggle { }); export default class CustomReboot extends Extension { - enable() { // Add items to QuickSettingsMenu this._indicator = new QuickSettings.SystemIndicator(); diff --git a/raveos-gnome-theme/theme-data/extensions/installed/customreboot@nova1545/grub.js b/raveos-gnome-theme/theme-data/extensions/installed/customreboot@nova1545/grub.js index 6d67ff0..21b072a 100644 --- a/raveos-gnome-theme/theme-data/extensions/installed/customreboot@nova1545/grub.js +++ b/raveos-gnome-theme/theme-data/extensions/installed/customreboot@nova1545/grub.js @@ -54,7 +54,6 @@ export class Grub { if (defualtEn == "") defualtEn = bootOptions.keys().next().value; return [bootOptions, defualtEn]; - } catch (e) { LogWarning(e); return undefined; @@ -110,13 +109,13 @@ export class Grub { * Copies a custom grub script to allow the extension to quickly reboot into another OS * If anyone reads this: Idk how to combine these into one pkexec call, if you do please leave a commit fixing it */ - static async EnableQuickReboot(ext) { + static async EnableQuickReboot(extension) { try { let [status, stdout, stderr] = await ExecCommand([ 'pkexec', 'sh', '-c', - `/usr/bin/cp ${ext.lookupByUUID('customreboot@nova1545').path()}/42_custom_reboot /etc/grub.d/42_custom_reboot && /usr/bin/chmod 755 /etc/grub.d/42_custom_reboot && /usr/sbin/update-grub` + `/usr/bin/cp ${extension.metadata.path}/42_custom_reboot /etc/grub.d/42_custom_reboot && /usr/bin/chmod 755 /etc/grub.d/42_custom_reboot && /usr/sbin/update-grub` ]); if (status !== 0) { @@ -130,7 +129,6 @@ export class Grub { return false; } } - /** * Removes the script used to allow the extension to quickly reboot into another OS without waiting for grub's timeout diff --git a/raveos-gnome-theme/theme-data/extensions/installed/customreboot@nova1545/metadata.json b/raveos-gnome-theme/theme-data/extensions/installed/customreboot@nova1545/metadata.json index 8cea11c..d9b9528 100644 --- a/raveos-gnome-theme/theme-data/extensions/installed/customreboot@nova1545/metadata.json +++ b/raveos-gnome-theme/theme-data/extensions/installed/customreboot@nova1545/metadata.json @@ -4,7 +4,6 @@ "name": "Custom Reboot", "original-author": "Nova1545", "shell-version": [ - "45", "46", "47", "48", @@ -13,5 +12,5 @@ ], "url": "https://github.com/Nova1545/gnome-shell-extension-customreboot", "uuid": "customreboot@nova1545", - "version": 11 -} + "version": 13 +}
\ No newline at end of file |