leyoda/cosmic-session
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #183 from thefossguy/fix-whitespace-vars-checking

Browse source 
start-cosmic: handle ANSI-C quoted strings returned by systemd
This commit is contained in:
Levi Portenier 2026-03-10 13:16:45 -06:00 • committed by GitHub
commit 59b48b5b3b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
data/start-cosmic
View file

@ -82,16 +82,23 @@ if command -v systemctl >/dev/null; then
# environment, update it. # environment, update it.
mapfile -t existing_env_vars < <(systemctl --user show-environment) mapfile -t existing_env_vars < <(systemctl --user show-environment)
for env_var in "${existing_env_vars[@]}"; do for env_var in "${existing_env_vars[@]}"; do
env_var_name="$(echo "${env_var}" | awk -F '=' '{print $1}')" env_var_name="${env_var%%=*}"
env_var_val_str_to_compare="${env_var_name}=${!env_var_name:-}" env_var_value=${!env_var_name:-}
if [[ "${env_var}" != "${env_var_val_str_to_compare}" ]]; then # Skip current iteration if the environment variable's value
# Update only if the value in current environment is non-empty # in the current envionment is unset.
env_var_unassigned_str="${env_var_name}=" if [[ -z "${env_var_value}" ]]; then
if [[ "${env_var_val_str_to_compare}" != "${env_var_unassigned_str}" ]]; then continue
systemctl --user import-environment "${env_var_name}" ||:
fi
fi fi
env_var_val_str_to_compare="${env_var_name}=${env_var_value}"
env_var_val_str_to_compare_ansi_c_quoted="${env_var_name}=\$'$(printf '%q' "${env_var_value}")'"
if [[ "${env_var}" == "${env_var_val_str_to_compare}" ]]; then
continue
elif [[ "${env_var}" == "${env_var_val_str_to_compare_ansi_c_quoted}" ]]; then
continue
fi
systemctl --user import-environment "${env_var_name}" ||:
done done
fi fi