wok rev 15937
cups-pam: fix stuff path
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Sat Feb 22 16:55:06 2014 +0100 (2014-02-22) |
parents | 579bfd0929b6 |
children | 1810c4d44a48 |
files | compiz/receipt compiz/stuff/compiz-session cups-pam/receipt |
line diff
1.1 --- a/compiz/receipt Sat Feb 22 11:27:57 2014 +0100 1.2 +++ b/compiz/receipt Sat Feb 22 16:55:06 2014 +0100 1.3 @@ -28,11 +28,11 @@ 1.4 1.5 post_install() 1.6 { 1.7 - res=$(cat $1/etc/slim.conf | grep ^session | sed s/"sessions. *"//) 1.8 + res=$(cat $root/etc/slim.conf | grep ^session | sed s/"sessions. *"//) 1.9 # Adding WM to SLIM available sessions. 1.10 if ! echo "$res" | grep -q $PACKAGE; then 1.11 echo -n "Adding $PACKAGE to /etc/slim.conf..." 1.12 - sed -i "s/^sessions.*/sessions ${res},$PACKAGE/" $1/etc/slim.conf 1.13 + sed -i "s/^sessions.*/sessions ${res},$PACKAGE/" $root/etc/slim.conf 1.14 status 1.15 fi 1.16 } 1.17 @@ -40,7 +40,7 @@ 1.18 post_remove() 1.19 { 1.20 # Remove WM from SLIM available sessions. 1.21 - if grep -q $PACKAGE $1/etc/slim.conf; then 1.22 - sed -i s/,$PACKAGE// $1/etc/slim.conf 1.23 + if grep -q $PACKAGE $root/etc/slim.conf; then 1.24 + sed -i s/,$PACKAGE// $root/etc/slim.conf 1.25 fi 1.26 }
2.1 --- a/compiz/stuff/compiz-session Sat Feb 22 11:27:57 2014 +0100 2.2 +++ b/compiz/stuff/compiz-session Sat Feb 22 16:55:06 2014 +0100 2.3 @@ -20,15 +20,15 @@ 2.4 cp -r /usr/share/slitaz/compiz/* $XDG_CONFIG_HOME/compiz-1/compizconfig 2.5 fi 2.6 2.7 -# PCmanFM config file. NOTE: will change with new PCmanFM 2.8 -if [ ! -f "$XDG_CONFIG_HOME/pcmanfm/main" ]; then 2.9 - mkdir -p $XDG_CONFIG_HOME/pcmanfm 2.10 - cp /usr/share/slitaz/lxde/pcmanfm.main \ 2.11 - $XDG_CONFIG_HOME/pcmanfm/main 2.12 -fi 2.13 +# PCmanFM config file. NOTE: We dont need a user config file 2.14 +#if [ ! -f "$XDG_CONFIG_HOME/pcmanfm/main" ]; then 2.15 + #mkdir -p $XDG_CONFIG_HOME/pcmanfm/default 2.16 + #cp /etc/xdg/pcmanfm/default/pcmanfm.conf \ 2.17 + #$XDG_CONFIG_HOME/pcmanfm/default 2.18 +#fi 2.19 2.20 # Start some LXDE componment. 2.21 lxpanel -p slitaz & 2.22 -pcmanfm -d & 2.23 +pcmanfm --desktop & 2.24 emerald & 2.25 exec compiz ccp --indirect-rendering
3.1 --- a/cups-pam/receipt Sat Feb 22 11:27:57 2014 +0100 3.2 +++ b/cups-pam/receipt Sat Feb 22 16:55:06 2014 +0100 3.3 @@ -21,7 +21,7 @@ 3.4 compile_rules() 3.5 { 3.6 cd $src 3.7 - patch -Np1 -i ${wanted_stuff}/install-sh.u 3.8 + patch -Np1 -i ${WOK}/cups/stuff/install-sh.u 3.9 ./configure \ 3.10 --prefix=/usr \ 3.11 --sysconfdir=/etc \ 3.12 @@ -58,7 +58,7 @@ 3.13 cp -a $stuff/etc $fs 3.14 3.15 # Daemon script 3.16 - cp -a ${wanted_stuff}/etc $fs 3.17 + cp -a ${WOK}/cups/stuff/etc $fs 3.18 } 3.19 3.20 # Start cups daemon and edit daemons.conf.