Fix: onLogin script when /etc/profile.d is executed with sh

etc/profile.d/99-linuxmuster-linuxclient7.sh

@@ -1,2 +1,9 @@
 scriptDir=$(/usr/sbin/linuxmuster-linuxclient7 get-constant scriptDir)
-source $scriptDir/executeHookWithEnvFix.sh onLogin
+tmpEnvFile=$(/usr/sbin/linuxmuster-linuxclient7 get-constant tmpEnvironmentFilePath)
+
+rm -f $tmpEnvFile
+
+LinuxmusterLinuxclient7EnvFixActive=1 PATH=$PATH:$scriptDir/env-fix $scriptDir/onLogin
+
+. $tmpEnvFile
+rm -f $tmpEnvFile

usr/lib/python3/dist-packages/linuxmusterLinuxclient7/templates.py

@@ -50,7 +50,7 @@ def _apply(templatePath):
         # never ever overwrite sssd.conf, this will lead to issues!
         # sssd.conf is written by `realm join`!
         if targetFilePath in constants.notTemplatableFiles:
-            logging.warning("Skipping forbidden file {}".format(targetFilePath))
+            logging.warning(f"Skipping forbidden file {targetFilePath}")
             return True
 
         # create target directory
@@ -61,7 +61,7 @@ def _apply(templatePath):
             fileData = _stripComment(fileData)
 
         # write config file
-        logging.debug("-> to {}".format(targetFilePath))
+        logging.debug(f"-> to {targetFilePath}")
         with open(targetFilePath, 'w') as targetFile:
             targetFile.write(fileData)
 

wiki/Insights/Environment-workaround.md

@@ -1,4 +1,4 @@
 This client uses Python. This brings a major problem: In Python it is not possible to modify the environment of the parent process.  
 Because of this, hook scripts must use `lmn-export` and `lmn-unset` instead of `export` and `unset`.
 These scripts write the environment variables to a temporary file in `~/.linuxmuster-linuxclient7-environment.sh` which is then sourced afterwards.
-This only works for the `onLogin.d` hook / the `logon.sh` script and is achieved by sourcing the script `/usr/share/linuxmuster-linuxclient7/scripts/executeHookWithEnvFix.sh` in `/etc/profile.d/99-linuxmuster-linuxclient7.sh` which then calls the `onLogin` script and sources `~/.linuxmuster-linuxclient7-environment.sh` afterwards.
+This only works for the `onLogin.d` hook / the `logon.sh` script and is achieved in `/etc/profile.d/99-linuxmuster-linuxclient7.sh` which calls the `onLogin` script and sources `~/.linuxmuster-linuxclient7-environment.sh` afterwards.

wiki/Insights/Script-calling-strategy.md

@@ -11,7 +11,7 @@ This file is placed there in adsso-setup via the template in `/usr/share/linuxmu
 Pam_exec calls this script on login AND on logout. If it is a login our logout is determined by the `PAM_TYPE` environment variable.
 
 ### onLogin
-This is called via `/usr/share/linuxmuster-linuxclient7/scripts/executeHookWithEnvFix.sh`, which is called by `/etc/profile.d/99-linuxmuster-linuxclient7.sh` The reason for this is the [environment workaround](Environment-workaround)
+This is called via `/etc/profile.d/99-linuxmuster-linuxclient7.sh`. Please note the [environment workaround](Environment-workaround).
 
 ### onSessionStart
 This is called via `/home/$user/.config/autostart`.