improve

nlpsuge · Apr 8, 2023 · a609813 · a609813
1 parent 4311cdb
commit a609813
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -99,13 +99,16 @@ sudo dnf install ydotool
 
 #Check the permission of `/dev/uinput`, if it's `crw-rw----+`, you can skip step 2
 # 2. Get permission to access to `/dev/uinput` as the normal user
-sudo touch /etc/udev/rules.d/60-awsm-ydotool-uinput.rules
-sudo echo '# See:
-     # https://github.com/ValveSoftware/steam-devices/blob/master/60-steam-input.rules 
-     # https://github.com/ReimuNotMoe/ydotool/issues/25
-
-     # ydotool udev write access
-     KERNEL=="uinput", SUBSYSTEM=="misc", TAG+="uaccess", OPTIONS+="static_node=uinput"' > /etc/udev/rules.d/60-awsm-ydotool-uinput.rules
+sudo touch /etc/udev/rules.d/60-awsm-ydotool-uinput.
+# Here we use `tee`, not redirect(>), to avoid `warning: An error occurred while redirecting file '/etc/udev/rules.d/60-awsm-ydotool-uinput.rules' open: Permission denied`
+# See: https://www.shellhacks.com/sudo-echo-to-file-permission-denied/
+echo '# See:
+# https://github.com/ValveSoftware/steam-devices/blob/master/60-steam-input.rules 
+# https://github.com/ReimuNotMoe/ydotool/issues/25
+
+# ydotool udev write access
+KERNEL=="uinput", SUBSYSTEM=="misc", TAG+="uaccess", OPTIONS+="static_node=uinput"' | sudo tee --append /etc/udev/rules.d/60-awsm-ydotool-uinput.rules
+cat /etc/udev/rules.d/60-awsm-ydotool-uinput.rules
 #Remove executable permission (a.k.a. x)
 sudo chmod 644 /etc/udev/rules.d/60-awsm-ydotool-uinput.rules
 

diff --git a/closeSession.js b/closeSession.js
@@ -391,7 +391,9 @@ var CloseSession = class {
                         Log.Log.getDefault().debug(`Finished to start ydotool.service. Started: ${started}`);
                         resolve(started);
                     } catch (error) {
-                        Log.Log.getDefault().error(error, 'Failed to start ydotool.service');
+                        const msg = 'Failed to start ydotool.service';
+                        Log.Log.getDefault().error(error, msg);
+                        global.notify_error(`${msg}`, `${error ? error.message : ''}`);
                         reject(false);
                     }
                 });

diff --git a/prefsCloseWindow.js b/prefsCloseWindow.js
@@ -77,8 +77,8 @@ var UICloseWindows = GObject.registerClass(
                     enabled: false,
                     method: 'equals',
                     compareWith: 'wm_class',
-                    enableWhenCloseWindows: false,
-                    enableWhenLogout: false,
+                    enableWhenCloseWindows: true,
+                    enableWhenLogout: true,
                 });
 
                 let oldWhitelist = JSON.parse(oldCloseWindowsWhitelist);
@@ -167,8 +167,8 @@ var UICloseWindows = GObject.registerClass(
                     value: {},
                     enabled: false,
                     keyDelay: 0,
-                    compareWith: 'title',
-                    method: 'includes'
+                    compareWith: 'wm_class',
+                    method: 'equals'
                 });
 
                 let oldCloseWindowsRulesObj = JSON.parse(oldCloseWindowsRules);