Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/265'

Browse Source 
* origin/pr/265:
  Replace custom script reloading with sourcing /etc/profile in qubes.GetAppmenus

Fixes QubesOS/qubes-issues#6163
This commit is contained in:
Marek Marczykowski-Górecki 2020-12-01 03:56:02 +01:00
commit 6da7f77013
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qubes-rpc/qubes.GetAppmenus
View File

@ -9,12 +9,8 @@
# Reload scripts in /etc/profile.d/, in case they register additional
# directories in XDG_DATA_DIRS and we forgot them
# (e.g. because we are running under sudo).
for i in /etc/profile.d/*.sh ; do
if [ -r "$i" ]; then
# shellcheck disable=SC1090
. "$i" >/dev/null
fi
done
# shellcheck disable=SC1091
source /etc/profile
if [ -z "$XDG_DATA_HOME" ]; then
user="$(whoami)"