Merge branch 'feature/51705_make_activate_shortcuts_not_need_dbus-launch' into 'master'

Make activate shortcuts not need dbus-launch

See merge request os2borgerpc/os2borgerpc-scripts!181

Author: Andreas Poulsen

.gitlab-ci.yml

@@ -46,6 +46,6 @@ Lint python scripts:
   image: python:3.10-alpine
   before_script:
     - apk add --no-cache --virtual .deps gcc musl-dev
-    - pip install black==22.12.0
+    - pip install black
   script:
     - black --check --diff --exclude=migrations .

os2borgerpc/custom/kobenhavn/cicero_install_pam/raw_scripts/cicero_interface.py

@@ -7,7 +7,6 @@
 
 
 def cicero_validate(cicero_user, cicero_pass):
-
     host_address = (
         check_output(["get_os2borgerpc_config", "admin_url"]).decode().strip()
     )

os2borgerpc/custom/kobenhavn/cicero_install_pam/raw_scripts/pam_module.py

@@ -5,7 +5,6 @@
 
 
 def pam_sm_authenticate(pamh, flags, argv):
-
     # print(pamh.fail_delay)
     # http://pam-python.sourceforge.net/doc/html/
     username_msg = pamh.Message(pamh.PAM_PROMPT_ECHO_OFF, "Lånernummer eller CPR")

os2borgerpc/desktop/desktop_activate_shortcuts.sh

@@ -16,15 +16,13 @@ rm --force /home/$SHADOW/.config/autostart/gio-fix-desktop-file-permissions.desk
 cat << EOF > "$GIO_SCRIPT"
 #! /usr/bin/env sh
 
-# gio needs to run as the user + dbus-launch, we have this script to create it and kill it afterwards
-export \$(dbus-launch)
-DBUS_PROCESS=\$\$
+# gio needs to run as the user with correct dbus settings
+export DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/$(id -u user)/bus"
 
 for FILE in /home/$USER/Skrivebord/*.desktop; do
   gio set "\$FILE" metadata::trusted true
 done
 
-kill \$DBUS_PROCESS
 EOF
 
 # Script to activate programs on the desktop
@@ -42,7 +40,9 @@ su --login user --command $GIO_SCRIPT
 # Now set the permissions back to their restricted form
 for FILE in /home/$USER/Skrivebord/*.desktop; do
   chown root:$USER "\$FILE"
-  # Can't make sense of this as it already has execute permissions, but it won't work without it
+  # In order for gio changes to take effect, it is necessary to update the file time stamp
+  # This can be done with many commands such as chmod or simply touch
+  # However, in some cases the files might not have execute permission so we add it with chmod
   chmod ug+x "\$FILE"
 done
 EOF

os2borgerpc_kiosk/os2borgerpc_kiosk/auto_activate_chromium.py

@@ -110,7 +110,6 @@
         expected.visibility_of_element_located((By.CLASS_NAME, "default--full-screen"))
     )
 except:  # noqa: E722 - TODO: next refactor: investigate which exceptions specifically
-
     print("Exception occured while waiting for OS2display screen.")
 
 token = browser.execute_script("return localStorage.getItem('indholdskanalen_token')")

tools/plyvel_helper.py

@@ -22,7 +22,6 @@ class PlyvelInterface:
     """
 
     def __init__(self):
-
         # self.db = plyvel.DB('/home/' + user + '/snap/chromium/common/chromium/Default/Sync Data/LevelDB', create_if_missing=True, compression=None)  # noqa E501
         self.db = plyvel.DB(
             "/home/"