Remove the env export in start script, lxsession should handle them now

ubuntu/bionic
Julien Lavergne 12 years ago
parent 64e1795130
commit f3667f90db

@ -1,32 +1,5 @@
#!/bin/sh #!/bin/sh
#Workaround to disable rgba, because lxpanel in Lubuntu doesn't support it
#(see bug #589763)
#
#export XLIB_SKIP_ARGB_VISUALS=1
if [ -z "$XDG_CONFIG_HOME" ]; then
export XDG_CONFIG_HOME="$HOME/.config"
fi
#Allow custom configuration files in /etc/xdg/lubuntu
#Patch stolen from Xubuntu
if test "x$XDG_CONFIG_DIRS" = "x"
then
XDG_CONFIG_DIRS="/etc/xdg/lubuntu:/etc/xdg"
else
XDG_CONFIG_DIRS="/etc/xdg/lubuntu/:$XDG_CONFIG_DIRS"
fi
export XDG_CONFIG_DIRS
if test "x$XDG_DATA_DIRS" = "x"
then
XDG_DATA_DIRS="/etc/xdg/lubuntu:/usr/local/share:/usr/share:/usr/share/gdm:/var/lib/menu-xdg"
else
XDG_DATA_DIRS="/etc/xdg/lubuntu:$XDG_DATA_DIRS:/usr/share:/usr/share/gdm:/var/lib/menu-xdg"
fi
export XDG_DATA_DIRS
# Ensure the existance of openbox config file # Ensure the existance of openbox config file
OPENBOX_CONF_DIR="$XDG_CONFIG_HOME/openbox" OPENBOX_CONF_DIR="$XDG_CONFIG_HOME/openbox"
if [ ! -f "$OPENBOX_CONF_DIR/lubuntu-rc.xml" ]; then if [ ! -f "$OPENBOX_CONF_DIR/lubuntu-rc.xml" ]; then
@ -56,28 +29,5 @@ if [ ! -f "$XDG_CONFIG_HOME/lxterminal/lxterminal.conf" ]; then
cp /etc/xdg/lubuntu/lxterminal/lxterminal.conf "$XDG_CONFIG_HOME/lxterminal/lxterminal.conf" cp /etc/xdg/lubuntu/lxterminal/lxterminal.conf "$XDG_CONFIG_HOME/lxterminal/lxterminal.conf"
fi fi
# Clean up after GDM (GDM sets the number of desktops to one)
xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
#Ensure the menu prefix
export XDG_MENU_PREFIX="lxde-"
# Enable GTK+2 integration for OpenOffice.org, if available.
export SAL_USE_VCLPLUGIN=gtk
# Launch DBus if needed
if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then
eval "$(dbus-launch --sh-syntax --exit-with-session)"
fi
# Start SSH agent, require since 3.5
# (see https://wiki.archlinux.org/index.php/Openbox#SSH_agent_no_longer_starting)
SSHAGENT="/usr/bin/ssh-agent"
SSHAGENTARGS="-s"
if [ -z "$SSH_AUTH_SOCK" -a -x "$SSHAGENT" ]; then
eval `$SSHAGENT $SSHAGENTARGS`
trap "kill $SSH_AGENT_PID" 0
fi
# Start the LXDE session # Start the LXDE session
exec /usr/bin/lxsession -s Lubuntu -e LXDE exec /usr/bin/lxsession -s Lubuntu -e LXDE

Loading…
Cancel
Save