# HG changeset patch # User Christophe Lincoln # Date 1393084506 -3600 # Node ID 41794be0da159ab97e539cb215011a03aa9284d7 # Parent 579bfd0929b608aa1f67629fa2612ea6b27c4978 cups-pam: fix stuff path diff -r 579bfd0929b6 -r 41794be0da15 compiz/receipt --- a/compiz/receipt Sat Feb 22 11:27:57 2014 +0100 +++ b/compiz/receipt Sat Feb 22 16:55:06 2014 +0100 @@ -28,11 +28,11 @@ post_install() { - res=$(cat $1/etc/slim.conf | grep ^session | sed s/"sessions. *"//) + res=$(cat $root/etc/slim.conf | grep ^session | sed s/"sessions. *"//) # Adding WM to SLIM available sessions. if ! echo "$res" | grep -q $PACKAGE; then echo -n "Adding $PACKAGE to /etc/slim.conf..." - sed -i "s/^sessions.*/sessions ${res},$PACKAGE/" $1/etc/slim.conf + sed -i "s/^sessions.*/sessions ${res},$PACKAGE/" $root/etc/slim.conf status fi } @@ -40,7 +40,7 @@ post_remove() { # Remove WM from SLIM available sessions. - if grep -q $PACKAGE $1/etc/slim.conf; then - sed -i s/,$PACKAGE// $1/etc/slim.conf + if grep -q $PACKAGE $root/etc/slim.conf; then + sed -i s/,$PACKAGE// $root/etc/slim.conf fi } diff -r 579bfd0929b6 -r 41794be0da15 compiz/stuff/compiz-session --- a/compiz/stuff/compiz-session Sat Feb 22 11:27:57 2014 +0100 +++ b/compiz/stuff/compiz-session Sat Feb 22 16:55:06 2014 +0100 @@ -20,15 +20,15 @@ cp -r /usr/share/slitaz/compiz/* $XDG_CONFIG_HOME/compiz-1/compizconfig fi -# PCmanFM config file. NOTE: will change with new PCmanFM -if [ ! -f "$XDG_CONFIG_HOME/pcmanfm/main" ]; then - mkdir -p $XDG_CONFIG_HOME/pcmanfm - cp /usr/share/slitaz/lxde/pcmanfm.main \ - $XDG_CONFIG_HOME/pcmanfm/main -fi +# PCmanFM config file. NOTE: We dont need a user config file +#if [ ! -f "$XDG_CONFIG_HOME/pcmanfm/main" ]; then + #mkdir -p $XDG_CONFIG_HOME/pcmanfm/default + #cp /etc/xdg/pcmanfm/default/pcmanfm.conf \ + #$XDG_CONFIG_HOME/pcmanfm/default +#fi # Start some LXDE componment. lxpanel -p slitaz & -pcmanfm -d & +pcmanfm --desktop & emerald & exec compiz ccp --indirect-rendering diff -r 579bfd0929b6 -r 41794be0da15 cups-pam/receipt --- a/cups-pam/receipt Sat Feb 22 11:27:57 2014 +0100 +++ b/cups-pam/receipt Sat Feb 22 16:55:06 2014 +0100 @@ -21,7 +21,7 @@ compile_rules() { cd $src - patch -Np1 -i ${wanted_stuff}/install-sh.u + patch -Np1 -i ${WOK}/cups/stuff/install-sh.u ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -58,7 +58,7 @@ cp -a $stuff/etc $fs # Daemon script - cp -a ${wanted_stuff}/etc $fs + cp -a ${WOK}/cups/stuff/etc $fs } # Start cups daemon and edit daemons.conf.