xinit and shared-mime-info fix.

2015-10-02 21:40:01 +03:00
parent e243808554
commit a96a00974e
11 changed files with 12 additions and 15 deletions
@@ -0,0 +1,11 @@
+
+SYSRESOURCES=/etc/X11/Xresources
+USERRESOURCES=$HOME/.Xresources
+
+if [ -f $SYSRESOURCES ]; then
+    xrdb -merge $SYSRESOURCES
+fi
+
+if [ -f "$USERRESOURCES" ]; then
+    xrdb -merge "$USERRESOURCES"
+fi
@@ -0,0 +1,5 @@
+
+CK_LAUNCH_SESSION=/usr/bin/ck-launch-session
+if [ -x "$CK_LAUNCH_SESSION" -a -z "$XDG_SESSION_COOKIE" ]; then
+    STARTUP="$CK_LAUNCH_SESSION $STARTUP"
+fi
@@ -0,0 +1,3 @@
+if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
+    eval `/usr/bin/dbus-launch --sh-syntax --exit-with-session`
+fi
@@ -0,0 +1,9 @@
+[ -e /etc/profile.env ] && . /etc/profile.env
+
+if [ "$EUID" = "0" ] || [ "$USER" = "root" ] ; then
+    PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${ROOTPATH}"
+else
+    PATH="/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:${PATH}"
+fi
+export PATH
+unset ROOTPATH
@@ -0,0 +1,6 @@
+
+
+if [ -x /usr/bin/xhost -a -x /usr/bin/id ]; then
+    xhost +si:localuser:`id -un` > /dev/null
+fi
+xhost +
@@ -0,0 +1,5 @@
+
+SSH_AGENT=/usr/bin/ssh-agent
+if [ -x "$SSH_AGENT" -a -z "$SSH_AGENT_PID" ]; then
+    STARTUP="$SSH_AGENT $STARTUP"
+fi
@@ -0,0 +1,42 @@
+
+DEFAULT_DESKTOP=/etc/default/desktop
+USER_XSESSION=$HOME/.xsession
+SESSION=$DESKTOP_SESSION
+STARTUP=
+
+case $1 in
+    failsafe)
+        exec -l $SHELL -c "xterm -geometry 80x24-0-0"
+        ;;
+    custom)
+        if [ -x "$USER_XSESSION" ]; then
+            STARTUP="$USER_XSESSION"
+        fi
+        ;;
+    default|"")
+        test -f $DEFAULT_DESKTOP && . $DEFAULT_DESKTOP
+
+        if [ -n $SESSION ]; then
+            desktop_file="/usr/share/xsessions/$SESSION.desktop"
+            session_script="/etc/X11/Sessions/$SESSION"
+
+            if [ -f "$desktop_file" ]; then
+                STARTUP=`grep "^Exec=" "$desktop_file" | cut -d= -f 2-`
+            elif [ -x "$session_script" ]; then
+                STARTUP="$session_script"
+            fi
+        fi
+        ;;
+    *)
+        STARTUP="$1"
+        ;;
+esac
+
+if [ -z "$STARTUP" ]; then
+    # If STARTUP is still empty, try user script first.
+    if [ -x "$USER_XSESSION" ]; then
+        STARTUP="$USER_XSESSION"
+    else
+        STARTUP="xsm"
+    fi
+fi
@@ -0,0 +1,11 @@
+
+if test -z "${XDG_RUNTIME_DIR}"; then
+    export XDG_RUNTIME_DIR=/tmp/${UID}-runtime-dir
+    if ! test -d "${XDG_RUNTIME_DIR}"; then
+        mkdir "${XDG_RUNTIME_DIR}"
+        chmod 0700 "${XDG_RUNTIME_DIR}"
+    fi
+fi
+mkdir -p ~/.config
+#cp weston/weston.ini ~/.config
+#$EDITOR ~/.config/weston.ini
@@ -0,0 +1,4 @@
+USER_XKB=$HOME/.xkb
+USER_KEYMAP=$USER_XKB/keymap/default
+
+[ -r $USER_KEYMAP ] && xkbcomp -I$USER_XKB $USER_KEYMAP $DISPLAY