View | Details | Raw Unified | Return to bug 46524
Collapse All | Expand All

(-)a/desktop/univention-kde/univention-set-kdedirs (-21 / +11 lines)
 Lines 33-40    Link Here 
33
33
34
eval "$(/usr/sbin/univention-config-registry shell)"
34
eval "$(/usr/sbin/univention-config-registry shell)"
35
35
36
touch $HOME/.univention-environment
37
38
# univentionDesktopProfile might be set via UCR
36
# univentionDesktopProfile might be set via UCR
39
univentionDesktopProfile=""
37
univentionDesktopProfile=""
40
38
 Lines 65-70   if [ -n "$univentionDesktopProfile" ]; then Link Here 
65
			KDEDIRS="$KDEDIRS:$i/.kde"
63
			KDEDIRS="$KDEDIRS:$i/.kde"
66
		done
64
		done
67
		echo -n "$univentionDesktopProfile" >$HOME/.kdeprofile
65
		echo -n "$univentionDesktopProfile" >$HOME/.kdeprofile
66
		chown "$USER" "$HOME/.kdeprofile"
68
	fi
67
	fi
69
else
68
else
70
	if [ -e "$HOME/.kdeprofile" ]; then
69
	if [ -e "$HOME/.kdeprofile" ]; then
 Lines 97-120   if [ -n "$univentionDesktopProfile" ]; then Link Here 
97
	fi
96
	fi
98
fi
97
fi
99
98
100
if [ -n "$XDG_DATA_DIRS" ] && [ -n "$XDG_CONFIG_DIRS" ] && [ -n "$KDEDIRS" ]; then
99
touch "$HOME/.univention-environment"
101
	if [ -e $HOME/.univention-environment ]; then
100
sed -i -r -e 's/^export\s*//;/^(XDG_DATA_DIRS|XDG_CONFIG_DIRS|KDEDIRS|LANG|univentionAutoStartScript)=|^$/d' "$HOME/.univention-environment"
102
		sed -i 's|^export XDG_DATA_DIRS.*||g;s|^export XDG_CONFIG_DIRS.*||g;s|^export KDEDIRS.*||g;s|^export LANG.*||g;s|^export univentionAutoStartScript.*||g' $HOME/.univention-environment
101
{
103
		# remove empty lines
102
	[ -n "$XDG_DATA_DIRS" ] && echo "XDG_DATA_DIRS=$XDG_DATA_DIRS"
104
		sed -i '/^$/d' $HOME/.univention-environment
103
	[ -n "$XDG_CONFIG_DIRS" ] && echo "XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS"
105
	fi
104
	[ -n "$KDEDIRS" ] && echo "KDEDIRS=$KDEDIRS"
106
	echo "export XDG_DATA_DIRS=$XDG_DATA_DIRS" >>$HOME/.univention-environment
105
	[ -n "$LANG" ] && echo "LANG=$LANG"
107
	echo "export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS" >>$HOME/.univention-environment
106
	[ -n "$univentionAutoStartScript" ] && echo "univentionAutoStartScript=$univentionAutoStartScript"
108
	echo "export KDEDIRS=$KDEDIRS" >>$HOME/.univention-environment
107
} >>$HOME/.univention-environment
109
	if [ -n "$LANG" ]; then
108
chown "$USER" "$HOME/.univention-environment"
110
		echo "export LANG=$LANG" >>$HOME/.univention-environment
111
	fi
112
	if [ -n "$univentionAutoStartScript" ]; then
113
		echo "export univentionAutoStartScript=$univentionAutoStartScript" >>$HOME/.univention-environment
114
	fi
115
116
fi
117
118
chown "$USER" "$HOME/.univention-environment" "$HOME/.kdeprofile"
119
109
120
exit 0
110
exit 0

Return to bug 46524