# HG changeset patch # User Christophe Lincoln # Date 1398975037 -7200 # Node ID b8e9cfb8e9d0b1b90b05c0f078c1c9af3686da58 # Parent c02fa4aa50ece28b43c00761b45c43ab22b209b8 Fix tazx (we have no X session on rc1... diff -r c02fa4aa50ec -r b8e9cfb8e9d0 tinyutils/tazx --- a/tinyutils/tazx Thu May 01 09:58:16 2014 +0200 +++ b/tinyutils/tazx Thu May 01 22:10:37 2014 +0200 @@ -202,20 +202,21 @@ } # ~/.config/slitaz/applications.conf: Missing = failed to login +# Make users applications.conf in /etc/skel so new added user will get +# a working X session. Note --> flavors can have a custom config in +# /etc/slitaz/applications that we must use. slitaz_apps_conf() { apps_conf=/etc/slitaz/applications.conf - user_conf="$HOME/.config/slitaz/applications.conf" - - # Make users applications.conf in /etc/skel so new added user will get - # a working X session. It is gen now --> flavors can have a custom one - if test $(id -u) = 0; then - conf="/etc/skel/.config/slitaz/applications.conf" - mkdir -p $(dirname $user_conf); cp -f ${apps_conf} ${conf} - fi - # If started by: startx and with boot opts screen=text - if [ ! -f "$user_conf" ]; then - mkdir -p $(dirname $user_conf); cp ${apps_conf} ${user_conf} + if [ "$(id -u)" = 0 ]; then + user_conf="/etc/skel/.config/slitaz/applications.conf" + mkdir -p $(dirname $user_conf); cp -f ${apps_conf} ${user_conf} + else + # If started by: startx and with boot opts screen=text + user_conf="$HOME/.config/slitaz/applications.conf" + if [ ! -f "$user_conf" ]; then + mkdir -p $(dirname $user_conf); cp ${apps_conf} ${user_conf} + fi fi }