# HG changeset patch # User Christophe Lincoln # Date 1304804839 -7200 # Node ID a1644dbcf6323b19c2cb1f321e7a123a17e1a72e # Parent 74b63eaf8099320346ef405b920836cc41627a4b a*, b*, c*: starte with a tiny sed in the wok for stuff/ --> $/stuff diff -r 74b63eaf8099 -r a1644dbcf632 acpid/receipt --- a/acpid/receipt Sat May 07 23:32:30 2011 +0200 +++ b/acpid/receipt Sat May 07 23:47:19 2011 +0200 @@ -17,7 +17,7 @@ compile_rules() { # Build acpi_fakekey utility - cp -a stuff/acpi_fakekey.c . + cp -a $stuff/acpi_fakekey.c . gcc -g -Wall -o acpi_fakekey acpi_fakekey.c # Generate key constants file INPUT_H="/usr/include/linux/input.h" @@ -47,8 +47,8 @@ cp -a $_pkg/usr/bin $fs/usr # acpid conf files mkdir -p $fs/etc - cp -a stuff/init.d $fs/etc/ - cp -a stuff/acpi $fs/etc/ + cp -a $stuff/init.d $fs/etc/ + cp -a $stuff/acpi $fs/etc/ # acpi_fakekey cp -a acpi_fakekey $fs/usr/bin cp -a $KEY_FILE $fs/etc/acpi/ diff -r 74b63eaf8099 -r a1644dbcf632 ajaxterm/receipt --- a/ajaxterm/receipt Sat May 07 23:32:30 2011 +0200 +++ b/ajaxterm/receipt Sat May 07 23:47:19 2011 +0200 @@ -18,7 +18,7 @@ { mkdir -p $fs/usr/share/ajaxterm cp -a $src/*.py $src/*.js $src/*.css $src/*.html $fs/usr/share/ajaxterm - cp -a stuff/* $fs/ + cp -a $stuff/* $fs/ } post_install() diff -r 74b63eaf8099 -r a1644dbcf632 apache/receipt --- a/apache/receipt Sat May 07 23:32:30 2011 +0200 +++ b/apache/receipt Sat May 07 23:47:19 2011 +0200 @@ -20,7 +20,7 @@ { cd $src grep -q Slitaz config.layout || \ - cat ../stuff/slitaz.layout >> config.layout + cat ../$stuff/slitaz.layout >> config.layout ./configure --mandir=/usr/share/man --enable-mods-shared=all \ --enable-proxy --enable-ssl \ --enable-layout=Slitaz $CONFIGURE_ARGS && @@ -41,7 +41,7 @@ rm -rf $fs/etc/apache/original cp -a $_pkg/var $fs - cp -a stuff/apache $fs/etc/init.d + cp -a $stuff/apache $fs/etc/init.d sed -i -e 's|User daemon|User www|' -e 's|Group daemon|Group www|' \ -e 's|ServerAdmin you@example.com|ServerAdmin root@localhost|' \ diff -r 74b63eaf8099 -r a1644dbcf632 asterisk/receipt --- a/asterisk/receipt Sat May 07 23:32:30 2011 +0200 +++ b/asterisk/receipt Sat May 07 23:47:19 2011 +0200 @@ -56,7 +56,7 @@ cp -a $_pkg/usr/bin $fs/usr cp -a $_pkg/usr/lib $fs/usr cp -a $_pkg/usr/sbin $fs/usr - cp -a stuff/* $fs + cp -a $stuff/* $fs } # Rules to configure package diff -r 74b63eaf8099 -r a1644dbcf632 audacious/receipt --- a/audacious/receipt Sat May 07 23:32:30 2011 +0200 +++ b/audacious/receipt Sat May 07 23:47:19 2011 +0200 @@ -37,6 +37,6 @@ cp -a $_pkg/usr/lib/*.so* $fs/usr/lib/ cp -a $_pkg/usr/share/$PACKAGE $fs/usr/share cp -a $_pkg/usr/share/pixmaps $fs/usr/share - tar -xzf stuff/Skins.tar.gz -C $fs/usr/share/$PACKAGE + tar -xzf $stuff/Skins.tar.gz -C $fs/usr/share/$PACKAGE } diff -r 74b63eaf8099 -r a1644dbcf632 awstats/receipt --- a/awstats/receipt Sat May 07 23:32:30 2011 +0200 +++ b/awstats/receipt Sat May 07 23:47:19 2011 +0200 @@ -31,7 +31,7 @@ cp -a $src/wwwroot/cgi-bin/awstats.pl $fs/var/www/cgi-bin cp -a $src/wwwroot/cgi-bin/awstats.model.conf $fs/etc/awstats - cp stuff/* $fs/usr/share/awstats/extras + cp $stuff/* $fs/usr/share/awstats/extras # Add a link using google map sed -i 's|Full Whois Field"|Full Whois Field ?"|' \ diff -r 74b63eaf8099 -r a1644dbcf632 backuppc/receipt --- a/backuppc/receipt Sat May 07 23:32:30 2011 +0200 +++ b/backuppc/receipt Sat May 07 23:47:19 2011 +0200 @@ -39,7 +39,7 @@ genpkg_rules() { cp -a $_pkg/* $fs - cp -a stuff/* $fs + cp -a $stuff/* $fs sed -i -e "s/''http/'http/;s/min''/min'/" \ -e 's/-E -N -d/-E -d/' \ -e "s/^\\\$Conf{CgiAdminUsers}.*/\$Conf{CgiAdminUsers} = 'root';/" \ diff -r 74b63eaf8099 -r a1644dbcf632 bash/receipt --- a/bash/receipt Sat May 07 23:32:30 2011 +0200 +++ b/bash/receipt Sat May 07 23:47:19 2011 +0200 @@ -40,7 +40,7 @@ # Config files. # mkdir $fs/etc - cp stuff/example.bashrc $fs/etc/bashrc + cp $stuff/example.bashrc $fs/etc/bashrc } # Post install commands for Tazpkg. diff -r 74b63eaf8099 -r a1644dbcf632 beaver/receipt --- a/beaver/receipt Sat May 07 23:32:30 2011 +0200 +++ b/beaver/receipt Sat May 07 23:47:19 2011 +0200 @@ -32,5 +32,5 @@ cp -a $_pkg/usr/share/beaver/resource $fs/usr/share/beaver cp -a $_pkg/usr/share/pixmaps $fs/usr/share # Custom default configuration - cp -a stuff/beaver.conf.default $fs/usr/share/beaver/resource + cp -a $stuff/beaver.conf.default $fs/usr/share/beaver/resource } diff -r 74b63eaf8099 -r a1644dbcf632 beneath-a-steel-sky/receipt --- a/beneath-a-steel-sky/receipt Sat May 07 23:32:30 2011 +0200 +++ b/beneath-a-steel-sky/receipt Sat May 07 23:47:19 2011 +0200 @@ -16,6 +16,6 @@ { mkdir -p $fs/usr/share/applications $fs/usr/games/bass cp -a $src/sky* $fs/usr/games/bass - cp -a stuff/*.desktop $fs/usr/share/applications + cp -a $stuff/*.desktop $fs/usr/share/applications } diff -r 74b63eaf8099 -r a1644dbcf632 bind/receipt --- a/bind/receipt Sat May 07 23:32:30 2011 +0200 +++ b/bind/receipt Sat May 07 23:47:19 2011 +0200 @@ -32,6 +32,6 @@ mkdir -p $fs/usr $fs/var/cache/bind cp -a $_pkg/usr/sbin $fs/usr cp -a $_pkg/etc $fs - cp -a stuff/etc $fs + cp -a $stuff/etc $fs } diff -r 74b63eaf8099 -r a1644dbcf632 blender/receipt --- a/blender/receipt Sat May 07 23:32:30 2011 +0200 +++ b/blender/receipt Sat May 07 23:47:19 2011 +0200 @@ -66,6 +66,6 @@ mkdir -p $fs/usr/bin $fs/usr/share/pixmaps cp -a $src/obj/linux-glibc2*/bin/blender $fs/usr/bin/blender-bin cp -a $src/obj/linux-glibc2*/bin/blenderplayer $fs/usr/bin - cp stuff/blender $fs/usr/bin + cp $stuff/blender $fs/usr/bin cp -a $src/bin/.blender $fs/usr/share/blender } diff -r 74b63eaf8099 -r a1644dbcf632 boxbackup-client/receipt --- a/boxbackup-client/receipt Sat May 07 23:32:30 2011 +0200 +++ b/boxbackup-client/receipt Sat May 07 23:47:19 2011 +0200 @@ -23,7 +23,7 @@ cp -a $_pkg/boxbackup-${VERSION}-backup-client-linux-gnu/bb* $fs/usr/bin rm -f $fs/usr/bin/*.* mkdir -p $fs/etc/init.d - cp -a stuff/bbackupd $fs/etc/init.d + cp -a $stuff/bbackupd $fs/etc/init.d } # Pre and post install commands for Tazpkg diff -r 74b63eaf8099 -r a1644dbcf632 boxbackup-server/receipt --- a/boxbackup-server/receipt Sat May 07 23:32:30 2011 +0200 +++ b/boxbackup-server/receipt Sat May 07 23:47:19 2011 +0200 @@ -42,7 +42,7 @@ cp -a $_pkg/boxbackup-${VERSION}-backup-server-linux-gnu/bb* $fs/usr/bin cp -a $_pkg/boxbackup-${VERSION}-backup-server-linux-gnu/ra* $fs/usr/bin mkdir -p $fs/etc/init.d - cp -a stuff/bbstored $fs/etc/init.d + cp -a $stuff/bbstored $fs/etc/init.d } diff -r 74b63eaf8099 -r a1644dbcf632 btmgr/receipt --- a/btmgr/receipt Sat May 07 23:32:30 2011 +0200 +++ b/btmgr/receipt Sat May 07 23:47:19 2011 +0200 @@ -14,13 +14,13 @@ compile_rules() { echo "I'm too lazy to hack and build it !" -# stuff/btmgr has been built this way: +# $stuff/btmgr has been built this way: # 1- # wget http://btmgr.sourceforge.net/${VERSION%-*}/sbminst-static # 2- # chmod +x sbminst-static # 3- # dd if=/dev/zero of=/dev/fd0 bs=18k count=80 # 4- # ./sbminst-static -t us -d /dev/fd0 -# 5- # dd if=/dev/fd0 of=stuff/btmgr -# 6- remove tailing zeros stuff/btmgr +# 5- # dd if=/dev/fd0 of=$stuff/btmgr +# 6- remove tailing zeros $stuff/btmgr } @@ -28,7 +28,7 @@ genpkg_rules() { mkdir -p $fs/usr/share/boot - cp stuff/btmgr $fs/usr/share/boot/ + cp $stuff/btmgr $fs/usr/share/boot/ } # Pre and post install commands for Tazpkg. diff -r 74b63eaf8099 -r a1644dbcf632 celestia/receipt --- a/celestia/receipt Sat May 07 23:32:30 2011 +0200 +++ b/celestia/receipt Sat May 07 23:47:19 2011 +0200 @@ -15,7 +15,7 @@ compile_rules() { cd $src - patch -p0 -i ../stuff/celestia-1.6.0-gcc45.patch + patch -p0 -i ../$stuff/celestia-1.6.0-gcc45.patch ./configure \ --prefix=/usr \ --infodir=/usr/share/info \ @@ -30,7 +30,7 @@ { mkdir -p $fs/usr/share/applications cp -a $_pkg/usr/bin $fs/usr - cp -a stuff/celestia.desktop $fs/usr/share/applications + cp -a $stuff/celestia.desktop $fs/usr/share/applications cp -a $_pkg/usr/share/celestia $fs/usr/share cp -a $_pkg/usr/share/pixmaps $fs/usr/share } diff -r 74b63eaf8099 -r a1644dbcf632 cgoban/receipt --- a/cgoban/receipt Sat May 07 23:32:30 2011 +0200 +++ b/cgoban/receipt Sat May 07 23:47:19 2011 +0200 @@ -28,6 +28,6 @@ { mkdir -p $fs/usr/bin $fs/usr/share/applications cp -a $_pkg/usr/bin/cgoban $fs/usr/bin - cp stuff/cgoban.desktop $fs/usr/share/applications + cp $stuff/cgoban.desktop $fs/usr/share/applications } diff -r 74b63eaf8099 -r a1644dbcf632 chemtool/receipt --- a/chemtool/receipt Sat May 07 23:32:30 2011 +0200 +++ b/chemtool/receipt Sat May 07 23:47:19 2011 +0200 @@ -34,7 +34,7 @@ # French locale, pixmap and menu. cp -a $_pkg/usr/share/locale/fr $fs/usr/share/locale cp -a $src/gnome/chemtool.png $fs/usr/share/pixmaps - cp -a stuff/chemtool.desktop $fs/usr/share/applications + cp -a $stuff/chemtool.desktop $fs/usr/share/applications # Examples. cp -a $src/examples/a*.cht $fs/usr/share/examples/chemtool diff -r 74b63eaf8099 -r a1644dbcf632 cherokee/receipt --- a/cherokee/receipt Sat May 07 23:32:30 2011 +0200 +++ b/cherokee/receipt Sat May 07 23:47:19 2011 +0200 @@ -39,6 +39,6 @@ cp -a $_pkg/usr/share/cherokee $fs/usr/share cp -a $_pkg/var $fs cp -a $_pkg/etc $fs - cp -a stuff/cherokee $fs/etc/init.d + cp -a $stuff/cherokee $fs/etc/init.d } diff -r 74b63eaf8099 -r a1644dbcf632 chillispot/receipt --- a/chillispot/receipt Sat May 07 23:32:30 2011 +0200 +++ b/chillispot/receipt Sat May 07 23:47:19 2011 +0200 @@ -26,6 +26,6 @@ mkdir -p $fs/usr $fs/etc/init.d $fs/var/lib/chilli/ cp -a $_pkg/usr/sbin $fs/usr cp $src/doc/chilli.conf $fs/etc - cp stuff/chilli $fs/etc/init.d + cp $stuff/chilli $fs/etc/init.d } diff -r 74b63eaf8099 -r a1644dbcf632 clamav/receipt --- a/clamav/receipt Sat May 07 23:32:30 2011 +0200 +++ b/clamav/receipt Sat May 07 23:47:19 2011 +0200 @@ -40,8 +40,8 @@ # Copy only shared lib (.so) cp -a $_pkg/usr/lib/*.so* $fs/usr/lib cp -a $_pkg/usr/share/clamav $fs/usr/share - # Copy daemon from /stuff - cp stuff/daemon-clamd $fs/etc/init.d/clamd + # Copy daemon from /$stuff + cp $stuff/daemon-clamd $fs/etc/init.d/clamd } post_install() diff -r 74b63eaf8099 -r a1644dbcf632 clex/receipt --- a/clex/receipt Sat May 07 23:32:30 2011 +0200 +++ b/clex/receipt Sat May 07 23:47:19 2011 +0200 @@ -30,5 +30,5 @@ { mkdir -p $fs/etc $fs/usr/bin cp -a $_pkg/usr/bin/* $fs/usr/bin - cp -a stuff/skel $fs/etc + cp -a $stuff/skel $fs/etc } diff -r 74b63eaf8099 -r a1644dbcf632 conky/receipt --- a/conky/receipt Sat May 07 23:32:30 2011 +0200 +++ b/conky/receipt Sat May 07 23:47:19 2011 +0200 @@ -33,5 +33,5 @@ { mkdir -p $fs/usr $fs/etc/conky cp -a $_pkg/usr/bin $fs/usr - cp -a stuff/conky.conf $fs/etc/conky + cp -a $stuff/conky.conf $fs/etc/conky } diff -r 74b63eaf8099 -r a1644dbcf632 ctorrent-dnh/receipt --- a/ctorrent-dnh/receipt Sat May 07 23:32:30 2011 +0200 +++ b/ctorrent-dnh/receipt Sat May 07 23:47:19 2011 +0200 @@ -28,5 +28,5 @@ mkdir -p $fs/usr cp -a $_pkg/usr/bin $fs/usr # Torrentbox - cp stuff/torrentbox $fs/usr/bin + cp $stuff/torrentbox $fs/usr/bin } diff -r 74b63eaf8099 -r a1644dbcf632 cups-pam/receipt --- a/cups-pam/receipt Sat May 07 23:32:30 2011 +0200 +++ b/cups-pam/receipt Sat May 07 23:47:19 2011 +0200 @@ -63,10 +63,10 @@ done # PAM conf - cp -a stuff/* $fs + cp -a $stuff/* $fs # Daemon script - cp -a ../cups/stuff/etc $fs + cp -a ../cups/$stuff/etc $fs } # Start cups daemon and edit daemons.conf. diff -r 74b63eaf8099 -r a1644dbcf632 cups/receipt --- a/cups/receipt Sat May 07 23:32:30 2011 +0200 +++ b/cups/receipt Sat May 07 23:47:19 2011 +0200 @@ -67,7 +67,7 @@ done # Daemon script - cp -a stuff/etc $fs + cp -a $stuff/etc $fs } # Start cups daemon and edit daemons.conf. diff -r 74b63eaf8099 -r a1644dbcf632 cyrus-imapd/receipt --- a/cyrus-imapd/receipt Sat May 07 23:32:30 2011 +0200 +++ b/cyrus-imapd/receipt Sat May 07 23:47:19 2011 +0200 @@ -34,7 +34,7 @@ cp -a $_pkg/usr/lib/perl5 $fs/usr/lib strip -s $fs/usr/lib/cyrus/* cp $src/tools/mkimap $fs/usr/lib/cyrus - cp -a stuff/etc $fs + cp -a $stuff/etc $fs cp $src/master/conf/small.conf $fs/etc/cyrus.conf for i in proc db socket log msg ptclient; do mkdir -m 755 $fs/var/imap/$i diff -r 74b63eaf8099 -r a1644dbcf632 cyrus-sasl/receipt --- a/cyrus-sasl/receipt Sat May 07 23:32:30 2011 +0200 +++ b/cyrus-sasl/receipt Sat May 07 23:47:19 2011 +0200 @@ -31,9 +31,9 @@ cp -a $_pkg/usr/sbin $fs/usr cp -a $_pkg/usr/lib/*.so* $fs/usr/lib cp -a $_pkg/usr/lib/sasl2/*.so* $fs/usr/lib/sasl2 - cp -a stuff/etc $fs + cp -a $stuff/etc $fs - cat $WOK/$PACKAGE/stuff/*.files-list | while read file; do + cat $WOK/$PACKAGE/$stuff/*.files-list | while read file; do rm -rf $fs$file done }