# HG changeset patch # User Pascal Bellard # Date 1450620825 -3600 # Node ID 9e01bc6321eab56fb274badda84bd0d0404c7a0d # Parent 67528625d306311b58343c4cc5df746b6db607ac Quote root dir in post_install diff -r 67528625d306 -r 9e01bc6321ea QtWeb/receipt --- a/QtWeb/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/QtWeb/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -62,7 +62,7 @@ post_install() { - cd $1/tmp ; cat>'QtWeb Internet Browser.conf' << EOT + cd "$1/tmp" ; cat>'QtWeb Internet Browser.conf' << EOT [MainWindow] downloadAudioVideo=true style=Cleanlooks @@ -78,10 +78,10 @@ showDisableJavascript=true EOT - for i in $(ls $1/home 2> /dev/null); do - [ -f /home/$i/.config/QtWeb.NET/QtWeb\ Internet\ Browser.conf ] && continue - mkdir -p $1/home/$i/.config/QtWeb.NET - cp $1/tmp/QtWeb\ Internet\ Browser.conf $1/home/$i/.config/QtWeb.NET - chroot $1/ chown -R $(stat -c "%u.%g" $1/home/$i) /home/$i/.config/QtWeb.NET + for i in $(ls "$1/home" 2> /dev/null); do + [ -f "/home/$i/.config/QtWeb.NET/QtWeb Internet Browser.conf" ] && continue + mkdir -p "$1/home/$i/.config/QtWeb.NET" + cp "$1/tmp/QtWeb Internet Browser.conf" "$1/home/$i/.config/QtWeb.NET" + chroot "$1/" chown -R $(stat -c "%u.%g" "$1/home/$i") "/home/$i/.config/QtWeb.NET" done } diff -r 67528625d306 -r 9e01bc6321ea TiMidity++/receipt --- a/TiMidity++/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/TiMidity++/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -36,12 +36,12 @@ post_install() { # create config file - mkdir $1/usr/share/timidity - touch $1/usr/share/timidity/timidity.cfg + mkdir "$1/usr/share/timidity" + touch "$1/usr/share/timidity/timidity.cfg" } post_remove() { - rm -rf $1/usr/share/timidity + rm -rf "$1/usr/share/timidity" } diff -r 67528625d306 -r 9e01bc6321ea ajaxterm/receipt --- a/ajaxterm/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/ajaxterm/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -27,16 +27,16 @@ post_install() { - grep ^RUN_DAEMONS $1/etc/rcS.conf | grep -q "ajaxterm" || sed -i \ - 's/RUN_DAEMONS="/RUN_DAEMONS="ajaxterm /' $1/etc/rcS.conf + grep ^RUN_DAEMONS "$1/etc/rcS.conf" | grep -q "ajaxterm" || sed -i \ + 's/RUN_DAEMONS="/RUN_DAEMONS="ajaxterm /' "$1/etc/rcS.conf" # Configure lighttpd server - if [ -f $1/usr/lib/lighttpd/mod_proxy.so ]; then - grep -q mod_proxy $1/etc/lighttpd/lighttpd.conf || - cat >> $1/etc/lighttpd/lighttpd.conf <> "$1/etc/lighttpd/lighttpd.conf" <> $1/etc/lighttpd/lighttpd.conf <> "$1/etc/lighttpd/lighttpd.conf" < ( ( "host" => "127.0.0.1", "port" => 8022 ) ) ) @@ -48,9 +48,9 @@ fi fi # Configure apache server - if [ -f $1/etc/apache/httpd.conf ]; then - if [ ! -f $1/etc/apache/conf.d/ajaxterm ]; then - cat > $1/etc/apache/conf.d/ajaxterm < "$1/etc/apache/conf.d/ajaxterm" < ProxyRequests Off @@ -70,8 +70,8 @@ fi fi [ -z "$1" ] && /etc/init.d/ajaxterm start - [ ! -f $1/usr/lib/lighttpd/mod_proxy.so -a \ - ! -f $1/etc/apache/httpd.conf ] && + [ ! -f "$1/usr/lib/lighttpd/mod_proxy.so" -a \ + ! -f "$1/etc/apache/httpd.conf" ] && [ -z "$quiet" ] && cat <> $1/etc/apache/httpd.conf - echo "Include /etc/apache/extra/httpd-mod-wsgi.conf " >> $1/etc/apache/httpd.conf + echo "# Python WSGI module" >> "$1/etc/apache/httpd.conf" + echo "Include /etc/apache/extra/httpd-mod-wsgi.conf " >> "$1/etc/apache/httpd.conf" } post_remove() { # Remove WSGI configuration - sed -i s/\# Python.*// $1/etc/apache/httpd.conf - sed -i s/.*httpd-mod-wsgi.conf// $1/etc/apache/httpd.conf + sed -i s/\# Python.*// "$1/etc/apache/httpd.conf" + sed -i s/.*httpd-mod-wsgi.conf// "$1/etc/apache/httpd.conf" } diff -r 67528625d306 -r 9e01bc6321ea apache/receipt --- a/apache/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/apache/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -80,12 +80,12 @@ local hostname=$(cat /etc/hostname 2>/dev/null) # Just in case. - chown www.www $1/var/log/$PACKAGE + chown www.www "$1/var/log/$PACKAGE" ping -c 2 $(hostname) > /dev/null 2>&1 || - sed -i "s/localhost/$(hostname) localhost/" $1/etc/hosts - [ -s $1/etc/ssl/apache/apache.pem ] || - openssl req -new -x509 -keyout $1/etc/ssl/apache/apache.pem \ - -out $1/etc/ssl/apache/apache.pem -days 3650 -nodes < /dev/null | grep -q :80 || /etc/init.d/$PACKAGE start } diff -r 67528625d306 -r 9e01bc6321ea asterisk/receipt --- a/asterisk/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/asterisk/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -85,36 +85,36 @@ { case "$2" in mysql_host) - sed -i "s|^hostname=.*|hostname=$3|" $1/etc/asterisk/cdr_mysql.conf - sed -i "s|^dbhost=.*|dbhost=$3|" $1/etc/asterisk/res_mysql.conf + sed -i "s|^hostname=.*|hostname=$3|" "$1/etc/asterisk/cdr_mysql.conf" + sed -i "s|^dbhost=.*|dbhost=$3|" "$1/etc/asterisk/res_mysql.conf" ;; mysql_user) - sed -i "s|^user=.*|user=$3|" $1/etc/asterisk/cdr_mysql.conf - sed -i "s|^dbuser=.*|dbuser=$3|" $1/etc/asterisk/res_mysql.conf + sed -i "s|^user=.*|user=$3|" "$1/etc/asterisk/cdr_mysql.conf" + sed -i "s|^dbuser=.*|dbuser=$3|" "$1/etc/asterisk/res_mysql.conf" ;; mysql_password) - sed -i "s|^password=.*|password=$3|" $1/etc/asterisk/cdr_mysql.conf - sed -i "s|^dbpass=.*|dbpass=$3|" $1/etc/asterisk/res_mysql.conf + sed -i "s|^password=.*|password=$3|" "$1/etc/asterisk/cdr_mysql.conf" + sed -i "s|^dbpass=.*|dbpass=$3|" "$1/etc/asterisk/res_mysql.conf" ;; mysql_database) - sed -i "s|^dbname=.*|dbname=$3|" $1/etc/asterisk/res_mysql.conf \ - $1/etc/asterisk/cdr_mysql.conf + sed -i "s|^dbname=.*|dbname=$3|" "$1/etc/asterisk/res_mysql.conf" \ + "$1/etc/asterisk/cdr_mysql.conf" ;; pgsql_host) - sed -i "s|^hostname=.*|hostname=$3|" $1/etc/asterisk/cdr_pgsql.conf - sed -i "s|^dbhost=.*|dbhost=$3|" $1/etc/asterisk/res_pgsql.conf + sed -i "s|^hostname=.*|hostname=$3|" "$1/etc/asterisk/cdr_pgsql.conf" + sed -i "s|^dbhost=.*|dbhost=$3|" "$1/etc/asterisk/res_pgsql.conf" ;; pgsql_user) - sed -i "s|^user=.*|user=$3|" $1/etc/asterisk/cdr_pgsql.conf - sed -i "s|^dbuser=.*|dbuser=$3|" $1/etc/asterisk/res_pgsql.conf + sed -i "s|^user=.*|user=$3|" "$1/etc/asterisk/cdr_pgsql.conf" + sed -i "s|^dbuser=.*|dbuser=$3|" "$1/etc/asterisk/res_pgsql.conf" ;; pgsql_password) - sed -i "s|^password=.*|password=$3|" $1/etc/asterisk/cdr_pgsql.conf - sed -i "s|^dbpass=.*|dbpass=$3|" $1/etc/asterisk/res_pgsql.conf + sed -i "s|^password=.*|password=$3|" "$1/etc/asterisk/cdr_pgsql.conf" + sed -i "s|^dbpass=.*|dbpass=$3|" "$1/etc/asterisk/res_pgsql.conf" ;; pgsql_database) - sed -i "s|^dbname=.*|dbname=$3|" $1/etc/asterisk/res_pgsql.conf \ - $1/etc/asterisk/cdr_pgsql.conf + sed -i "s|^dbname=.*|dbname=$3|" "$1/etc/asterisk/res_pgsql.conf" \ + "$1/etc/asterisk/cdr_pgsql.conf" ;; *) cat <> $1/etc/passwd - echo $BBUSER':!:14013:0:99999:7:::' >> $1/etc/shadow - echo $BBUSER':x:505:' >> $1/etc/group - echo $BBUSER':!::' >> $1/etc/gshadow + echo $BBUSER':x:505:505:BoxBackup Network Backup:/dev/null:/bin/false' >> "$1/etc/passwd" + echo $BBUSER':!:14013:0:99999:7:::' >> "$1/etc/shadow" + echo $BBUSER':x:505:' >> "$1/etc/group" + echo $BBUSER':!::' >> "$1/etc/gshadow" status fi # Create config is needed - if [ ! -e $1$CONF_DIR ]; then - mkdir -p $1$CONF_DIR && - chroot $1/ chown $BBUSER $CONF_DIR && - chmod 700 $1$CONF_DIR + if [ ! -e "$1$CONF_DIR" ]; then + mkdir -p "$1$CONF_DIR" && + chroot "$1/" chown $BBUSER $CONF_DIR && + chmod 700 "$1$CONF_DIR" fi - if [ ! -e $1$DATA_DIR/backup ]; then + if [ ! -e "$1$DATA_DIR/backup" ]; then # Creating backup dir action "Creating backup directory..." - mkdir -p $1$DATA_DIR/backup && - chroot $1/ chown -R $BBUSER $DATA_DIR && - chmod -R 700 $1$DATA_DIR + mkdir -p "$1$DATA_DIR/backup" && + chroot "$1/" chown -R $BBUSER $DATA_DIR && + chmod -R 700 "$1$DATA_DIR" status fi - if [ ! -e $1$CONF_DIR/raidfile.conf ]; then + if [ ! -e "$1$CONF_DIR/raidfile.conf" ]; then # RAID Setup action "Disabling deprecated userland RAID..." - chroot $1/ /usr/bin/raidfile-config $CONF_DIR 2048 $DATA_DIR 2>1 > /dev/null + chroot "$1/" /usr/bin/raidfile-config $CONF_DIR 2048 $DATA_DIR 2>1 > /dev/null status - chroot $1/ chown -R $BBUSER $CONF_DIR/raidfile.conf && - chmod 700 -R $1$CONF_DIR/raidfile.conf + chroot "$1/" chown -R $BBUSER $CONF_DIR/raidfile.conf && + chmod 700 -R "$1$CONF_DIR/raidfile.conf" fi - if [ ! -e $1$CONF_DIR/bbstored.conf ]; then + if [ ! -e "$1$CONF_DIR/bbstored.conf" ]; then # Setting hostname action "Setting hostname... " - if [ $(chroot $1/ hostname -f 2>1 > /dev/null;echo $?) -eq 0 ]; then - HOSTNAME=$(chroot $1/ hostname -f) + if [ $(chroot "$1/" hostname -f 2>1 > /dev/null;echo $?) -eq 0 ]; then + HOSTNAME=$(chroot "$1/" hostname -f) fi if [ -z $HOSTNAME ]; then HOSTNAME="127.0.0.1" @@ -115,17 +115,17 @@ # Setting up the CA environment action "Creating certificates..." - chroot $1/ /usr/bin/bbstored-certs $CA_DIR init 2>1 > /dev/null + chroot "$1/" /usr/bin/bbstored-certs $CA_DIR init 2>1 > /dev/null status # Generate server certificate request action "Generate server certificate request..." - chroot $1/ bbstored-config $CONF_DIR $HOSTNAME $BBUSER 2>1 > /dev/null + chroot "$1/" bbstored-config $CONF_DIR $HOSTNAME $BBUSER 2>1 > /dev/null status # Sign the server certificate action "Sign the server certificate..." - chroot $1/ openssl x509 -req -sha1 -extensions usr_crt \ + chroot "$1/" openssl x509 -req -sha1 -extensions usr_crt \ -in $CONF_DIR/$BBUSER/${HOSTNAME}-csr.pem \ -CA $CA_DIR/roots/serverCA.pem \ -CAkey $CA_DIR/keys/serverRootKey.pem \ @@ -135,18 +135,18 @@ # Preparing the server certificates action "Installing server certificate..." - cp -a $1$CA_DIR/servers/${HOSTNAME}-cert.pem $1$CONF_DIR/$BBUSER + cp -a "$1$CA_DIR/servers/${HOSTNAME}-cert.pem" "$1$CONF_DIR/$BBUSER" status action "Installing client certificate..." - cp -a $1$CA_DIR/roots/clientCA.pem $1$CONF_DIR/$BBUSER + cp -a "$1$CA_DIR/roots/clientCA.pem" "$1$CONF_DIR/$BBUSER" status # Securing $CONF_DIR - chroot $1/ chown -R $BBUSER $CONF_DIR/bbstored* && - chmod 700 -R $1$CONF_DIR/bbstored* + chroot "$1/" chown -R $BBUSER $CONF_DIR/bbstored* && + chmod 700 -R "$1$CONF_DIR/bbstored"* fi - if [ -e $1$CA_DIR ]; then + if [ -e "$1$CA_DIR" ]; then # Warning echo echo "IMPORTANT NOTE:" @@ -167,7 +167,7 @@ post_remove() { echo - if grep -q $BBUSER $1/etc/passwd; then + if grep -q $BBUSER /etc/passwd; then action "Removing $BBUSER user..." deluser bbstored status diff -r 67528625d306 -r 9e01bc6321ea busybox-pam/receipt --- a/busybox-pam/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/busybox-pam/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -34,5 +34,5 @@ post_install() { - chmod 4755 $1/bin/busybox + chmod 4755 "$1/bin/busybox" } diff -r 67528625d306 -r 9e01bc6321ea busybox-static/receipt --- a/busybox-static/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/busybox-static/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -27,5 +27,5 @@ post_install() { - chmod 4755 $1/usr/share/boot/busybox-static + chmod 4755 "$1/usr/share/boot/busybox-static" } diff -r 67528625d306 -r 9e01bc6321ea busybox/receipt --- a/busybox/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/busybox/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -168,8 +168,8 @@ local i cp -a /etc/resolv.conf /etc/resolv.conf-busybox-install answer="" - for i in $(cat $1$INSTALLED/$PACKAGE/files.list); do - [ -f $1$i ] || continue + for i in $(cat "$1$INSTALLED/$PACKAGE/files.list"); do + [ -f "$1$i" ] || continue case "$i" in /bin/busybox) continue ;; *bin/*) ;; @@ -183,7 +183,7 @@ *) answer="Y";; esac fi - cp -a $1$i $1$i-busybox-install + cp -a "$1$i" "$1$i-busybox-install" done } @@ -193,10 +193,10 @@ [ -f /etc/resolv.conf-busybox-install ] && mv -f /etc/resolv.conf-busybox-install /etc/resolv.conf while read i ; do - [ -f $1$i-busybox-install ] || continue - mv $1$i-busybox-install $1$i - done < $1$INSTALLED/$PACKAGE/files.list - chmod 4755 $1/bin/busybox + [ -f "$1$i-busybox-install" ] || continue + mv "$1$i-busybox-install" "$1$i" + done < "$1$INSTALLED/$PACKAGE/files.list" + chmod 4755 "$1/bin/busybox" touch $root/etc/daemons.conf # /etc/daemons.conf (tftp + dnsd + httpd may not be present) diff -r 67528625d306 -r 9e01bc6321ea c_icap/receipt --- a/c_icap/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/c_icap/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -73,6 +73,6 @@ post_remove() { echo "Removing stalled files..." - test -d $1/var/log/c-icap && rm -rf $1/var/log/c-icap - test -d $1/usr/run/c-icap && rm -rf $1/usr/run/c-icap + test -d "$1/var/log/c-icap" && rm -rf "$1/var/log/c-icap" + test -d "$1/usr/run/c-icap" && rm -rf "$1/usr/run/c-icap" } diff -r 67528625d306 -r 9e01bc6321ea ccid/receipt --- a/ccid/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/ccid/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -43,9 +43,9 @@ post_install() { # addgroup pcscd if needed - if ! grep -q pcscd $1/etc/group; then + if ! grep -q pcscd "$1/etc/group"; then echo -n "Adding group pcscd..." - chroot $1/ addgroup pcscd + chroot "$1/" addgroup pcscd status fi } diff -r 67528625d306 -r 9e01bc6321ea clamav/receipt --- a/clamav/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/clamav/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -70,23 +70,23 @@ # Enable freshclam update echo -n "Enabling freshclam update..." - cd $1/etc/clamav + cd "$1/etc/clamav" sed -i 's/^Example/#Example/' freshclam.conf status # adduser clamav if needed - if ! grep -q "${user}:" $1/etc/passwd; then + if ! grep -q "${user}:" "$1/etc/passwd"; then echo -n "Adding user/group $user..." - chroot $1/ addgroup -S $group - chroot $1/ adduser -s /bin/false -S -D -H -G $group $user + chroot "$1/" addgroup -S $group + chroot "$1/" adduser -s /bin/false -S -D -H -G $group $user status fi # Enable daily.cvd updates (sometimes needed for new version) - #chown -R ${user}:${group} $1/var/lib/clamav + #chown -R ${user}:${group} "$1/var/lib/clamav" # Fix perms - chroot $1/ chown -R ${user}.${group} /var/log/clamav \ + chroot "$1/" chown -R ${user}.${group} /var/log/clamav \ /run/clamav /var/lib/clamav } diff -r 67528625d306 -r 9e01bc6321ea claws-mail/receipt --- a/claws-mail/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/claws-mail/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -46,6 +46,6 @@ # Post installation custom. post_install() { - [ -x $1/usr/bin/gtk-update-icon-cache ] && + [ -x "$1/usr/bin/gtk-update-icon-cache" ] && chroot "$1/" gtk-update-icon-cache -f -t /usr/share/icons/hicolor } diff -r 67528625d306 -r 9e01bc6321ea connman/receipt --- a/connman/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/connman/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -66,13 +66,12 @@ # Pre and post remove commands for Tazpkg post_install() { - local root=$1 - if ! grep -qs ^CONNMAND_OPTIONS $root/etc/daemons.conf; then - echo '# Connman daemon options.' >> $root/etc/daemons.conf - echo 'CONNMAND_OPTIONS=""' >> $root/etc/daemons.conf - echo '' >> $root/etc/daemons.conf + if ! grep -qs ^CONNMAND_OPTIONS "$1/etc/daemons.conf"; then + echo '# Connman daemon options.' >> "$1/etc/daemons.conf" + echo 'CONNMAND_OPTIONS=""' >> "$1/etc/daemons.conf" + echo '' >> "$1/etc/daemons.conf" fi - if [ -z "$root" -a -s /etc/network.conf ]; then + if [ -z "$1" -a -s /etc/network.conf ]; then /etc/init.d/connman start || /etc/init.d/connman restart fi } diff -r 67528625d306 -r 9e01bc6321ea cookutils/receipt --- a/cookutils/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/cookutils/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -36,11 +36,11 @@ # Pre and post install commands for Tazpkg. post_install() { - case "$(cat $1/etc/hostname 2> /dev/null)" in + case "$(cat "$1/etc/hostname" 2> /dev/null)" in tank*) - if ! chroot $1/ tazpkg list | grep -q aufs ; then - tazpkg get-install aufs --root=$1/ - sed -i 's/LOAD_MODULES="/&aufs /' $1/etc/rcS.conf + if ! chroot "$1/" tazpkg list | grep -q aufs ; then + tazpkg get-install aufs --root="$1/" + sed -i 's/LOAD_MODULES="/&aufs /' "$1/etc/rcS.conf" fi ;; esac } diff -r 67528625d306 -r 9e01bc6321ea coreutils-character/receipt --- a/coreutils-character/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/coreutils-character/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -30,17 +30,15 @@ # pre_install() { - local root - root=$1 echo "Processing pre-install commands..." echo -n "Removing all Busybox replaced utils... " - rm -f $root/usr/bin/tr $root/usr/bin/expand $root/usr/bin/unexpand + rm -f "$1/usr/bin/tr" "$1/usr/bin/expand" "$1/usr/bin/unexpand" status } post_remove() { - ln -s /bin/busybox $1/usr/bin/tr - ln -s /bin/busybox $1/usr/bin/expand - ln -s /bin/busybox $1/usr/bin/unexpand + ln -s /bin/busybox "$1/usr/bin/tr" + ln -s /bin/busybox "$1/usr/bin/expand" + ln -s /bin/busybox "$1/usr/bin/unexpand" } diff -r 67528625d306 -r 9e01bc6321ea coreutils-command/receipt --- a/coreutils-command/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/coreutils-command/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -38,23 +38,21 @@ # pre_install() { - local root - root=$1 echo "Processing pre-install commands..." echo -n "Removing all Busybox replaced utils... " - rm -f $root/bin/nice $root/bin/kill $root/bin/sleep - rm -f $root/usr/bin/env $root/usr/bin/nohup $root/usr/bin/timeout - rm -f $root/usr/sbin/chroot + rm -f "$1/bin/nice" "$1/bin/kill" "$1/bin/sleep" + rm -f "$1/usr/bin/env" "$1/usr/bin/nohup" "$1/usr/bin/timeout" + rm -f "$1/usr/sbin/chroot" status } post_remove() { - ln -s /bin/busybox $1/bin/nice - ln -s /bin/busybox $1/bin/kill - ln -s /bin/busybox $1/bin/sleep - ln -s /bin/busybox $1/usr/bin/env - ln -s /bin/busybox $1/usr/bin/nohup - ln -s /bin/busybox $1/usr/bin/timeout - ln -s /bin/busybox $1/usr/sbin/chroot + ln -s /bin/busybox "$1/bin/nice" + ln -s /bin/busybox "$1/bin/kill" + ln -s /bin/busybox "$1/bin/sleep" + ln -s /bin/busybox "$1/usr/bin/env" + ln -s /bin/busybox "$1/usr/bin/nohup" + ln -s /bin/busybox "$1/usr/bin/timeout" + ln -s /bin/busybox "$1/usr/sbin/chroot" } diff -r 67528625d306 -r 9e01bc6321ea coreutils-conditions/receipt --- a/coreutils-conditions/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/coreutils-conditions/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -34,20 +34,18 @@ # pre_install() { - local root - root=$1 echo "Processing pre-install commands..." echo -n "Removing all Busybox replaced utils... " - rm -f $root/bin/false $root/bin/true - rm -f $root/usr/bin/test $root/usr/bin/[ $root/usr/bin/expr + rm -f "$1/bin/false" "$1/bin/true" + rm -f "$1/usr/bin/test" "$1/usr/bin/[" "$1/usr/bin/expr" status } post_remove() { - ln -s /bin/busybox $1/bin/false - ln -s /bin/busybox $1/bin/true - ln -s /bin/busybox $1/usr/bin/test - ln -s /bin/busybox $1/usr/bin/[ - ln -s /bin/busybox $1/usr/bin/expr + ln -s /bin/busybox "$1/bin/false" + ln -s /bin/busybox "$1/bin/true" + ln -s /bin/busybox "$1/usr/bin/test" + ln -s /bin/busybox "$1/usr/bin/[" + ln -s /bin/busybox "$1/usr/bin/expr" } diff -r 67528625d306 -r 9e01bc6321ea coreutils-context-system/receipt --- a/coreutils-context-system/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/coreutils-context-system/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -35,19 +35,17 @@ # pre_install() { - local root - root=$1 echo "Processing pre-install commands..." echo -n "Removing all Busybox replaced utils... " - rm -f $root/bin/date $root/bin/uname - rm -f $root/usr/bin/hostid $root/usr/bin/uptime + rm -f "$1/bin/date" "$1/bin/uname" + rm -f "$1/usr/bin/hostid" "$1/usr/bin/uptime" status } post_remove() { - ln -s /bin/busybox $1/bin/date - ln -s /bin/busybox $1/bin/uname - ln -s /bin/busybox $1/usr/bin/hostid - ln -s /bin/busybox $1/usr/bin/uptime + ln -s /bin/busybox "$1/bin/date" + ln -s /bin/busybox "$1/bin/uname" + ln -s /bin/busybox "$1/usr/bin/hostid" + ln -s /bin/busybox "$1/usr/bin/uptime" } diff -r 67528625d306 -r 9e01bc6321ea coreutils-context-user/receipt --- a/coreutils-context-user/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/coreutils-context-user/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -36,19 +36,17 @@ # pre_install() { - local root - root=$1 echo "Processing pre-install commands..." echo -n "Removing all Busybox replaced utils... " - rm -f $root/bin/id - rm -f $root/usr/bin/logname $root/usr/bin/whoami $root/usr/bin/who + rm -f "$1/bin/id" + rm -f "$1/usr/bin/logname" "$1/usr/bin/whoami" "$1/usr/bin/who" status } post_remove() { - ln -s /bin/busybox $1/bin/id - ln -s /bin/busybox $1/usr/bin/logname - ln -s /bin/busybox $1/usr/bin/whoami - ln -s /bin/busybox $1/usr/bin/who + ln -s /bin/busybox "$1/bin/id" + ln -s /bin/busybox "$1/usr/bin/logname" + ln -s /bin/busybox "$1/usr/bin/whoami" + ln -s /bin/busybox "$1/usr/bin/who" } diff -r 67528625d306 -r 9e01bc6321ea coreutils-context-working/receipt --- a/coreutils-context-working/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/coreutils-context-working/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -33,19 +33,17 @@ # pre_install() { - local root - root=$1 echo "Processing pre-install commands..." echo -n "Removing all Busybox replaced utils... " - rm -f $root/bin/pwd $root/bin/stty $root/bin/printenv - rm -f $root/usr/bin/tty + rm -f "$1/bin/pwd" "$1/bin/stty" "$1/bin/printenv" + rm -f "$1/usr/bin/tty" status } post_remove() { - ln -s /bin/busybox $1/bin/pwd - ln -s /bin/busybox $1/bin/stty - ln -s /bin/busybox $1/bin/printenv - ln -s /bin/busybox $1/usr/bin/tty + ln -s /bin/busybox "$1/bin/pwd" + ln -s /bin/busybox "$1/bin/stty" + ln -s /bin/busybox "$1/bin/printenv" + ln -s /bin/busybox "$1/usr/bin/tty" } diff -r 67528625d306 -r 9e01bc6321ea coreutils-directory/receipt --- a/coreutils-directory/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/coreutils-directory/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -33,18 +33,16 @@ # pre_install() { - local root - root=$1 echo "Processing pre-install commands..." echo -n "Removing all Busybox replaced utils... " - rm -f $root/bin/ls $root/usr/bin/dir $root/usr/bin/vdir $root/usr/bin/dircolors + rm -f "$1/bin/ls" "$1/usr/bin/dir" "$1/usr/bin/vdir" "$1/usr/bin/dircolors" status } post_remove() { - ln -s /bin/busybox $1/bin/ls - ln -s /bin/busybox $1/usr/bin/dir - ln -s /bin/busybox $1/usr/bin/vdir - ln -s /bin/busybox $1/usr/bin/dircolors + ln -s /bin/busybox "$1/bin/ls" + ln -s /bin/busybox "$1/usr/bin/dir" + ln -s /bin/busybox "$1/usr/bin/vdir" + ln -s /bin/busybox "$1/usr/bin/dircolors" } diff -r 67528625d306 -r 9e01bc6321ea coreutils-disk/receipt --- a/coreutils-disk/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/coreutils-disk/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -34,19 +34,17 @@ # pre_install() { - local root - root=$1 echo "Processing pre-install commands..." echo -n "Removing all Busybox replaced utils... " - rm -f $root/bin/df $root/bin/stat $root/bin/sync - rm -f $root/usr/bin/du + rm -f "$1/bin/df" "$1/bin/stat" "$1/bin/sync" + rm -f "$1/usr/bin/du" status } post_remove() { - ln -s /bin/busybox $1/bin/df - ln -s /bin/busybox $1/bin/stat - ln -s /bin/busybox $1/bin/sync - ln -s /bin/busybox $1/usr/bin/du + ln -s /bin/busybox "$1/bin/df" + ln -s /bin/busybox "$1/bin/stat" + ln -s /bin/busybox "$1/bin/sync" + ln -s /bin/busybox "$1/usr/bin/du" } diff -r 67528625d306 -r 9e01bc6321ea coreutils-file-attributes/receipt --- a/coreutils-file-attributes/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/coreutils-file-attributes/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -31,18 +31,16 @@ # pre_install() { - local root - root=$1 echo "Processing pre-install commands..." echo -n "Removing all Busybox replaced utils... " - rm -f $root/bin/chown $root/bin/chgrp $root/bin/chmod $root/bin/touch + rm -f "$1/bin/chown" "$1/bin/chgrp" "$1/bin/chmod" "$1/bin/touch" status } post_remove() { - ln -s /bin/busybox $1/bin/chown - ln -s /bin/busybox $1/bin/chgrp - ln -s /bin/busybox $1/bin/chmod - ln -s /bin/busybox $1/bin/touch + ln -s /bin/busybox "$1/bin/chown" + ln -s /bin/busybox "$1/bin/chgrp" + ln -s /bin/busybox "$1/bin/chmod" + ln -s /bin/busybox "$1/bin/touch" } diff -r 67528625d306 -r 9e01bc6321ea coreutils-file-format/receipt --- a/coreutils-file-format/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/coreutils-file-format/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -30,15 +30,13 @@ # pre_install() { - local root - root=$1 echo "Processing pre-install commands..." echo -n "Removing all Busybox replaced utils... " - rm -f $root/usr/bin/fold + rm -f "$root/usr/bin/fold" status } post_remove() { - ln -s /bin/busybox $1/usr/bin/fold + ln -s /bin/busybox "$1/usr/bin/fold" } diff -r 67528625d306 -r 9e01bc6321ea coreutils-file-output-full/receipt --- a/coreutils-file-output-full/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/coreutils-file-output-full/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -34,17 +34,15 @@ # pre_install() { - local root - root=$1 echo "Processing pre-install commands..." echo -n "Removing all Busybox replaced utils... " - rm -f $root/bin/cat $root/usr/bin/od $root/usr/bin/tac + rm -f "$1/bin/cat" "$1/usr/bin/od" "$1/usr/bin/tac" status } post_remove() { - ln -s /bin/busybox $1/bin/cat - ln -s /bin/busybox $1/usr/bin/od - ln -s /bin/busybox $1/usr/bin/tac + ln -s /bin/busybox "$1/bin/cat" + ln -s /bin/busybox "$1/usr/bin/od" + ln -s /bin/busybox "$1/usr/bin/tac" } diff -r 67528625d306 -r 9e01bc6321ea coreutils-file-output-part/receipt --- a/coreutils-file-output-part/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/coreutils-file-output-part/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -31,17 +31,15 @@ # pre_install() { - local root - root=$1 echo "Processing pre-install commands..." echo -n "Removing all Busybox replaced utils... " - rm -f $root/usr/bin/head $root/usr/bin/tail $root/usr/bin/split + rm -f "$1/usr/bin/head" "$1/usr/bin/tail" "$1/usr/bin/split" status } post_remove() { - ln -s /bin/busybox $1/usr/bin/head - ln -s /bin/busybox $1/usr/bin/tail - ln -s /bin/busybox $1/usr/bin/split + ln -s /bin/busybox "$1/usr/bin/head" + ln -s /bin/busybox "$1/usr/bin/tail" + ln -s /bin/busybox "$1/usr/bin/split" } diff -r 67528625d306 -r 9e01bc6321ea coreutils-file-sort/receipt --- a/coreutils-file-sort/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/coreutils-file-sort/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -33,17 +33,15 @@ # pre_install() { - local root - root=$1 echo "Processing pre-install commands..." echo -n "Removing all Busybox replaced utils... " - rm -f $root/usr/bin/sort $root/usr/bin/uniq $root/usr/bin/comm + rm -f "$1/usr/bin/sort" "$1/usr/bin/uniq" "$1/usr/bin/comm" status } post_remove() { - ln -s /bin/busybox $1/usr/bin/sort - ln -s /bin/busybox $1/usr/bin/uniq - ln -s /bin/busybox $1/usr/bin/comm + ln -s /bin/busybox "$1/usr/bin/sort" + ln -s /bin/busybox "$1/usr/bin/uniq" + ln -s /bin/busybox "$1/usr/bin/comm" } diff -r 67528625d306 -r 9e01bc6321ea coreutils-file-special/receipt --- a/coreutils-file-special/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/coreutils-file-special/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -38,31 +38,28 @@ # pre_install() { - local root - root=$1 echo "Processing pre-install commands..." echo -n "Removing all Busybox replaced utils... " - rm -f $root/bin/ln $root/bin/mkdir $root/bin/mknod $root/bin/rmdir - rm -f $root/usr/bin/mkfifo $root/usr/bin/readlink + rm -f "$1/bin/ln" "$1/bin/mkdir" "$1/bin/mknod" "$1/bin/rmdir" + rm -f "$1/usr/bin/mkfifo" "$1/usr/bin/readlink" status } pre_remove() { # Need to handle the removal of ln - cp -a -fd $1/bin/ln $1/bin/ln-coreutils + cp -a -fd "$1/bin/ln" "$1/bin/ln-coreutils" } - post_remove() { # Restore ln - ln-coreutils -s /bin/busybox $1/bin/ln + ln-coreutils -s /bin/busybox "$1/bin/ln" - ln -s /bin/busybox $1/bin/mkdir - ln -s /bin/busybox $1/bin/mknod - ln -s /bin/busybox $1/bin/rmdir - ln -s /bin/busybox $1/usr/bin/mkfifo - ln -s /bin/busybox $1/usr/bin/readlink + ln -s /bin/busybox "$1/bin/mkdir" + ln -s /bin/busybox "$1/bin/mknod" + ln -s /bin/busybox "$1/bin/rmdir" + ln -s /bin/busybox "$1/usr/bin/mkfifo" + ln -s /bin/busybox "$1/usr/bin/readlink" - rm -f $1/bin/ln-coreutils + rm -f "$1/bin/ln-coreutils" } diff -r 67528625d306 -r 9e01bc6321ea coreutils-file-summarize/receipt --- a/coreutils-file-summarize/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/coreutils-file-summarize/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -36,23 +36,21 @@ # pre_install() { - local root - root=$1 echo "Processing pre-install commands..." echo -n "Removing all Busybox replaced utils... " - rm -f $root/usr/bin/wc $root/usr/bin/sum $root/usr/bin/cksum \ - $root/usr/bin/md5sum $root/usr/bin/sha1sum \ - $root/usr/bin/sha256sum $root/usr/bin/sha512sum + rm -f "$1/usr/bin/wc" "$1/usr/bin/sum" "$1/usr/bin/cksum" \ + "$1/usr/bin/md5sum" "$1/usr/bin/sha1sum" \ + "$1/usr/bin/sha256sum" "$1/usr/bin/sha512sum" status } post_remove() { - ln -s /bin/busybox $1/usr/bin/wc - ln -s /bin/busybox $1/usr/bin/sum - ln -s /bin/busybox $1/usr/bin/cksum - ln -s /bin/busybox $1/usr/bin/md5sum - ln -s /bin/busybox $1/usr/bin/sha1sum - ln -s /bin/busybox $1/usr/bin/sha256sum - ln -s /bin/busybox $1/usr/bin/sha512sum + ln -s /bin/busybox "$1/usr/bin/wc" + ln -s /bin/busybox "$1/usr/bin/sum" + ln -s /bin/busybox "$1/usr/bin/cksum" + ln -s /bin/busybox "$1/usr/bin/md5sum" + ln -s /bin/busybox "$1/usr/bin/sha1sum" + ln -s /bin/busybox "$1/usr/bin/sha256sum" + ln -s /bin/busybox "$1/usr/bin/sha512sum" } diff -r 67528625d306 -r 9e01bc6321ea coreutils-line/receipt --- a/coreutils-line/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/coreutils-line/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -30,15 +30,13 @@ # pre_install() { - local root - root=$1 echo "Processing pre-install commands..." echo -n "Removing all Busybox replaced utils... " - rm -f $root/usr/bin/cut + rm -f "$1/usr/bin/cut" status } post_remove() { - ln -s /bin/busybox $1/usr/bin/cut + ln -s /bin/busybox "$1/usr/bin/cut" } diff -r 67528625d306 -r 9e01bc6321ea coreutils-numeric/receipt --- a/coreutils-numeric/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/coreutils-numeric/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -29,15 +29,13 @@ # pre_install() { - local root - root=$1 echo "Processing pre-install commands..." echo -n "Removing all Busybox replaced utils... " - rm -f $root/usr/bin/seq + rm -f "$1/usr/bin/seq" status } post_remove() { - ln -s /bin/busybox $1/usr/bin/seq + ln -s /bin/busybox "$1/usr/bin/seq" } diff -r 67528625d306 -r 9e01bc6321ea coreutils-operations/receipt --- a/coreutils-operations/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/coreutils-operations/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -34,10 +34,10 @@ { # use busybox ln applet directly since /bin/ln # in this package is remove already -# /bin/busybox ln -fs /bin/busybox $1/bin/cp - /bin/busybox ln -fs /bin/busybox $1/bin/dd - /bin/busybox ln -fs /bin/busybox $1/bin/mv - /bin/busybox ln -fs /bin/busybox $1/bin/ln -# /bin/busybox ln -fs /bin/busybox $1/bin/rm - /bin/busybox ln -fs /bin/busybox $1/usr/bin/install +# /bin/busybox ln -fs /bin/busybox "$1/bin/cp" + /bin/busybox ln -fs /bin/busybox "$1/bin/dd" + /bin/busybox ln -fs /bin/busybox "$1/bin/mv" + /bin/busybox ln -fs /bin/busybox "$1/bin/ln" +# /bin/busybox ln -fs /bin/busybox "$1/bin/rm" + /bin/busybox ln -fs /bin/busybox "$1/usr/bin/install" } diff -r 67528625d306 -r 9e01bc6321ea coreutils-path/receipt --- a/coreutils-path/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/coreutils-path/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -30,16 +30,14 @@ # pre_install() { - local root - root=$1 echo "Processing pre-install commands..." echo -n "Removing all Busybox replaced utils... " - rm -f $root/usr/bin/basename $root/usr/bin/dirname + rm -f "$1/usr/bin/basename" "$1/usr/bin/dirname" status } post_remove() { - ln -s /bin/busybox $1/usr/bin/basename - ln -s /bin/busybox $1/usr/bin/dirname + ln -s /bin/busybox "$1/usr/bin/basename" + ln -s /bin/busybox "$1/usr/bin/dirname" } diff -r 67528625d306 -r 9e01bc6321ea coreutils-print/receipt --- a/coreutils-print/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/coreutils-print/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -32,18 +32,16 @@ # pre_install() { - local root - root=$1 echo "Processing pre-install commands..." echo -n "Removing all Busybox replaced utils... " - rm -f $root/bin/echo - rm -f $root/usr/bin/printf $root/usr/bin/yes + rm -f "$1/bin/echo" + rm -f "$1/usr/bin/printf" "$1/usr/bin/yes" status } post_remove() { - ln -s /bin/busybox $1/bin/echo - ln -s /bin/busybox $1/usr/bin/printf - ln -s /bin/busybox $1/usr/bin/yes + ln -s /bin/busybox "$1/bin/echo" + ln -s /bin/busybox "$1/usr/bin/printf" + ln -s /bin/busybox "$1/usr/bin/yes" } diff -r 67528625d306 -r 9e01bc6321ea coreutils-redirection/receipt --- a/coreutils-redirection/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/coreutils-redirection/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -28,15 +28,13 @@ # pre_install() { - local root - root=$1 echo "Processing pre-install commands..." echo -n "Removing all Busybox replaced utils... " - rm -f $root/usr/bin/tee + rm -f "$1/usr/bin/tee" status } post_remove() { - ln -s /bin/busybox $1/usr/bin/tee + ln -s /bin/busybox "$1/usr/bin/tee" } diff -r 67528625d306 -r 9e01bc6321ea coreutils/receipt --- a/coreutils/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/coreutils/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -76,29 +76,27 @@ # pre_install() { - local root - root=$1 echo "Processing pre-install commands..." # we keed busybox cp for installing the pkg echo -n "Removing Busybox replaced utils... " - rm -f $root/usr/bin/od $root/usr/bin/split + rm -f "$1/usr/bin/od" "$1/usr/bin/split" status } post_install() { echo -n "Installing cp..." - rm $root/bin/cp && - mv $root/usr/bin/cp $root/bin + rm "$1/bin/cp" && + mv "$1/usr/bin/cp" "$1/bin" status } post_remove() { - ln -s ../../bin/busybox $1/usr/bin/od - ln -s ../../bin/busybox $1/usr/bin/split - rm -f $1/bin/cp - ln -s busybox $1/bin/cp + ln -s ../../bin/busybox "$1/usr/bin/od" + ln -s ../../bin/busybox "$1/usr/bin/split" + rm -f "$1/bin/cp" + ln -s busybox "$1/bin/cp" } clean_wok() diff -r 67528625d306 -r 9e01bc6321ea couchdb/receipt --- a/couchdb/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/couchdb/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -53,7 +53,7 @@ { INIT_FILE="/etc/init.d/$PACKAGE" echo "Processing pre-install commands..." - [ -f $1$$INIT_FILE ] && chroot "$1/" $INIT_FILE stop + [ -f "$1$INIT_FILE" ] && chroot "$1/" $INIT_FILE stop echo "Done..." } @@ -68,9 +68,9 @@ echo "Processing post-install commands..." - grep -q "$PACKAGE" $1/etc/group || chroot "$1/" addgroup -S $PACKAGE + grep -q "$PACKAGE" "$1/etc/group" || chroot "$1/" addgroup -S $PACKAGE - grep -q "$PACKAGE" $1/etc/passwd || chroot "$1/" adduser -S -D -H \ + grep -q "$PACKAGE" "$1/etc/passwd" || chroot "$1/" adduser -S -D -H \ -h $LIBDIR -G $PACKAGE -s /bin/sh -g "CouchDB Administrator" $PACKAGE for DIR in $LIBDIR $ETCDIR $LOGDIR $RUNDIR; do @@ -86,7 +86,7 @@ { INIT_FILE="/etc/init.d/$PACKAGE" echo "Processing pre-remove commands..." - [ -f $1$INIT_FILE ] && chroot "$1/" $INIT_FILE stop + [ -f "$1$INIT_FILE" ] && chroot "$1/" $INIT_FILE stop echo "Done..." } @@ -102,7 +102,7 @@ chroot "$1/" deluser $PACKAGE for DIR in $LIBDIR $ETCDIR $LOGDIR $RUNDIR; do - rm -rf $1$DIR + rm -rf "$1$DIR" done echo "Done..." diff -r 67528625d306 -r 9e01bc6321ea cpio/receipt --- a/cpio/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/cpio/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -38,10 +38,10 @@ # Remove Busybox symlink before installing pre_install() { - rm -f $1/bin/cpio + rm -f "$1/bin/cpio" } post_remove() { - ln -s /bin/busybox /bin/cpio + ln -s /bin/busybox "$1/bin/cpio" } diff -r 67528625d306 -r 9e01bc6321ea cyrus-imapd/receipt --- a/cyrus-imapd/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/cyrus-imapd/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -51,22 +51,22 @@ post_install() { # adduser cyrus if needed - if ! grep -q cyrus $1/etc/passwd; then + if ! grep -q cyrus "$1/etc/passwd"; then echo -n "Adding user cyrus..." - chroot $1/ adduser cyrus -D -H -S -h /tmp - chroot $1/ sh -c 'echo "cyrus:cyrus" | chpasswd -m > /dev/null' + chroot "$1/" adduser cyrus -D -H -S -h /tmp + chroot "$1/" sh -c 'echo "cyrus:cyrus" | chpasswd -m > /dev/null' status fi # addgroup mail if needed - if ! grep -q mail $1/etc/group; then + if ! grep -q mail "$1/etc/group"; then echo -n "Adding group mail..." - chroot $1/ sh -c 'addgroup mail && addgroup cyrus mail' + chroot "$1/" sh -c 'addgroup mail && addgroup cyrus mail' status fi - chroot $1/ chown -R cyrus.mail /var/spool/imap /var/imap + chroot "$1/" chown -R cyrus.mail /var/spool/imap /var/imap while read name port end; do - grep -q $port $1/etc/services || \ - echo "$name $port $end" >> $1/etc/services + grep -q $port "$1/etc/services" || \ + echo "$name $port $end" >> "$1/etc/services" done <= 1000) print $1 }' < $1/etc/passwd); do + for i in root $(awk -F: '{ if ($3 >= 1000) print $1 }' < "$1/etc/passwd"); do echo -n "$msg $i" msg="," done echo "" - for i in root $(awk -F: '{ if ($3 >= 1000) print $1 }' < $1/etc/passwd); do + for i in root $(awk -F: '{ if ($3 >= 1000) print $1 }' < "$1/etc/passwd"); do echo "createmailbox user.$i" - done | chroot $1/ cyradm -u cyrus -w cyrus 127.0.0.1 >/dev/null 2>&1 - chroot $1/ su -c "/usr/lib/cyrus/bin/reconstruct" cyrus >/dev/null 2>&1 + done | chroot "$1/" cyradm -u cyrus -w cyrus 127.0.0.1 >/dev/null 2>&1 + chroot "$1/" su -c "/usr/lib/cyrus/bin/reconstruct" cyrus >/dev/null 2>&1 cat <> $1/etc/ssh/sshd_config + [ -f "$1/etc/ssh/sshd_config" ] && + ! grep -q cyrus "$1/etc/ssh/sshd_config" && + echo "DenyUsers cyrus" >> "$1/etc/ssh/sshd_config" } post_remove() diff -r 67528625d306 -r 9e01bc6321ea daloradius/receipt --- a/daloradius/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/daloradius/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -32,9 +32,9 @@ post_install() { # Configure lighttpd server - if [ -f $1/etc/lighttpd/lighttpd.conf ]; then - if ! grep -q /usr/share/daloradius/ $1/etc/lighttpd/lighttpd.conf; then - sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/daloradius/" => "/usr/share/daloradius/",|g' -i $1/etc/lighttpd/lighttpd.conf + if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then + if ! grep -q /usr/share/daloradius/ "$1/etc/lighttpd/lighttpd.conf"; then + sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/daloradius/" => "/usr/share/daloradius/",|g' -i "$1/etc/lighttpd/lighttpd.conf" if [ -z "$1" ]; then # Start Web server. /etc/init.d/lighttpd stop @@ -43,9 +43,9 @@ fi fi # Configure apache server - if [ -f $1/etc/apache/httpd.conf ]; then - if [ ! -f $1/etc/apache/conf.d/daloradius ]; then - cat > $1/etc/apache/conf.d/daloradius < "$1/etc/apache/conf.d/daloradius" < Alias /daloradius /usr/share/daloradius diff -r 67528625d306 -r 9e01bc6321ea dansguardian/receipt --- a/dansguardian/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/dansguardian/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -41,7 +41,5 @@ post_install() { - local root - root=$1 - chown nobody.nogroup $root/var/log/dansguardian + chown nobody.nogroup "$1/var/log/dansguardian" } diff -r 67528625d306 -r 9e01bc6321ea depmod/receipt --- a/depmod/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/depmod/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -21,10 +21,10 @@ # Overlap busybox pre_install() { - rm -f $1/sbin/depmod + rm -f "$1/sbin/depmod" } post_remove() { - ln -s /bin/busybox $1/sbin/depmod + ln -s /bin/busybox "$1/sbin/depmod" } diff -r 67528625d306 -r 9e01bc6321ea diffutils/receipt --- a/diffutils/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/diffutils/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -30,12 +30,12 @@ # Overlap busybox pre_install() { - rm -f $1/usr/bin/diff - rm -f $1/usr/bin/cmp + rm -f "$1/usr/bin/diff" + rm -f "$1/usr/bin/cmp" } post_remove() { - ln -s /bin/busybox $1/usr/bin/diff - ln -s /bin/busybox $1/usr/bin/cmp + ln -s /bin/busybox "$1/usr/bin/diff" + ln -s /bin/busybox "$1/usr/bin/cmp" } diff -r 67528625d306 -r 9e01bc6321ea distcc/receipt --- a/distcc/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/distcc/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -46,15 +46,15 @@ post_install() { - if ! grep -q nagios $1/etc/passwd; then + if ! grep -q nagios "$1/etc/passwd"; then echo -n "Adding user/group nagios..." - chroot $1/ addgroup -S distcc - chroot $1/ adduser -S -D -H -G distcc distcc + chroot "$1/" addgroup -S distcc + chroot "$1/" adduser -S -D -H -G distcc distcc status fi # Fix perms for files and directories - chroot $1/ chown -R distcc.distcc /var/log/distccd + chroot "$1/" chown -R distcc.distcc /var/log/distccd cat < /dev/null + cp /etc/resolv.conf "$1/etc/resolv.conf" + fi # V4.1.2 - xmlcatalog --noout --add "public" \ + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook XML V4.1.2//EN" \ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc//xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" \ "http://www.oasis-open.org/docbook/xml/4.1.2/calstblx.dtd" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" \ "http://www.oasis-open.org/docbook/xml/4.1.2/calstblx.dtd" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ "http://www.oasis-open.org/docbook/xml/4.1.2/soextblx.dtd" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" \ "http://www.oasis-open.org/docbook/xml/4.1.2/dbpoolx.mod" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" \ "http://www.oasis-open.org/docbook/xml/4.1.2/dbhierx.mod" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" \ "http://www.oasis-open.org/docbook/xml/4.1.2/dbgenent.mod" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" \ "http://www.oasis-open.org/docbook/xml/4.1.2/dbnotnx.mod" \ - "${DESTDIR}/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" \ "http://www.oasis-open.org/docbook/xml/4.1.2/dbcentx.mod" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "rewriteSystem" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "rewriteSystem" \ "http://www.oasis-open.org/docbook/xml/4.1.2" \ "file:///usr/share/xml/docbook/xml-dtd-4.1.2" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "rewriteURI" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "rewriteURI" \ "http://www.oasis-open.org/docbook/xml/4.1.2" \ "file:///usr/share/xml/docbook/xml-dtd-4.1.2" \ - "$root/etc/xml/docbook-xml" + "/etc/xml/docbook-xml" # V4.2 - xmlcatalog --noout --add "public" \ + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook XML V4.2//EN" \ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook CALS Table Model V4.2//EN" \ "http://www.oasis-open.org/docbook/xml/4.2/calstblx.dtd" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ "http://www.oasis-open.org/docbook/xml/4.2/soextblx.dtd" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook Information Pool V4.2//EN" \ "http://www.oasis-open.org/docbook/xml/4.2/dbpoolx.mod" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2//EN" \ "http://www.oasis-open.org/docbook/xml/4.2/dbhierx.mod" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook Additional General Entities V4.2//EN" \ "http://www.oasis-open.org/docbook/xml/4.2/dbgenent.mod" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook Notations V4.2//EN" \ "http://www.oasis-open.org/docbook/xml/4.2/dbnotnx.mod" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook Character Entities V4.2//EN" \ "http://www.oasis-open.org/docbook/xml/4.2/dbcentx.mod" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "rewriteSystem" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "rewriteSystem" \ "http://www.oasis-open.org/docbook/xml/4.2" \ "file:///usr/share/xml/docbook/xml-dtd-4.2" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "rewriteURI" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "rewriteURI" \ "http://www.oasis-open.org/docbook/xml/4.2" \ "file:///usr/share/xml/docbook/xml-dtd-4.2" \ - "$root/etc/xml/docbook-xml" + "/etc/xml/docbook-xml" # V4.3 - xmlcatalog --noout --add "public" \ + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook XML V4.3//EN" \ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook CALS Table Model V4.3//EN" \ "http://www.oasis-open.org/docbook/xml/4.3/calstblx.dtd" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ "http://www.oasis-open.org/docbook/xml/4.3/soextblx.dtd" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook Information Pool V4.3//EN" \ "http://www.oasis-open.org/docbook/xml/4.3/dbpoolx.mod" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.3//EN" \ "http://www.oasis-open.org/docbook/xml/4.3/dbhierx.mod" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook Additional General Entities V4.3//EN" \ "http://www.oasis-open.org/docbook/xml/4.3/dbgenent.mod" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook Notations V4.3//EN" \ "http://www.oasis-open.org/docbook/xml/4.3/dbnotnx.mod" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook Character Entities V4.3//EN" \ "http://www.oasis-open.org/docbook/xml/4.3/dbcentx.mod" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "rewriteSystem" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "rewriteSystem" \ "http://www.oasis-open.org/docbook/xml/4.3" \ "file:///usr/share/xml/docbook/xml-dtd-4.3" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "rewriteURI" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "rewriteURI" \ "http://www.oasis-open.org/docbook/xml/4.3" \ "file:///usr/share/xml/docbook/xml-dtd-4.3" \ - "$root/etc/xml/docbook-xml" + "/etc/xml/docbook-xml" # V4.4 - xmlcatalog --noout --add "public" \ + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook XML V4.4//EN" \ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook CALS Table Model V4.4//EN" \ "http://www.oasis-open.org/docbook/xml/4.4/calstblx.dtd" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4//EN" \ "http://www.oasis-open.org/docbook/xml/4.4/htmltblx.mod" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ "http://www.oasis-open.org/docbook/xml/4.4/soextblx.dtd" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook Information Pool V4.4//EN" \ "http://www.oasis-open.org/docbook/xml/4.4/dbpoolx.mod" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.4//EN" \ "http://www.oasis-open.org/docbook/xml/4.4/dbhierx.mod" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook Additional General Entities V4.4//EN" \ "http://www.oasis-open.org/docbook/xml/4.4/dbgenent.mod" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook Notations V4.4//EN" \ "http://www.oasis-open.org/docbook/xml/4.4/dbnotnx.mod" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook Character Entities V4.4//EN" \ "http://www.oasis-open.org/docbook/xml/4.4/dbcentx.mod" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "rewriteSystem" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "rewriteSystem" \ "http://www.oasis-open.org/docbook/xml/4.4" \ "file:///usr/share/xml/docbook/xml-dtd-4.4" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "rewriteURI" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "rewriteURI" \ "http://www.oasis-open.org/docbook/xml/4.4" \ "file:///usr/share/xml/docbook/xml-dtd-4.4" \ - "$root/etc/xml/docbook-xml" + "/etc/xml/docbook-xml" # V4.5 - xmlcatalog --noout --add "public" \ + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook XML V4.5//EN" \ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" \ "file:///usr/share/xml/docbook/xml-dtd-4.5/calstblx.dtd" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \ "file:///usr/share/xml/docbook/xml-dtd-4.5/soextblx.dtd" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \ "file:///usr/share/xml/docbook/xml-dtd-4.5/dbpoolx.mod" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" \ "file:///usr/share/xml/docbook/xml-dtd-4.5/dbhierx.mod" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" \ "file:///usr/share/xml/docbook/xml-dtd-4.5/htmltblx.mod" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \ "file:///usr/share/xml/docbook/xml-dtd-4.5/dbnotnx.mod" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \ "file:///usr/share/xml/docbook/xml-dtd-4.5/dbcentx.mod" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "public" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "public" \ "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \ "file:///usr/share/xml/docbook/xml-dtd-4.5/dbgenent.mod" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "rewriteSystem" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "rewriteSystem" \ "http://www.oasis-open.org/docbook/xml/4.5" \ "file:///usr/share/xml/docbook/xml-dtd-4.5" \ - "$root/etc/xml/docbook-xml" - xmlcatalog --noout --add "rewriteURI" \ + "/etc/xml/docbook-xml" + chroot "$1/" xmlcatalog --noout --add "rewriteURI" \ "http://www.oasis-open.org/docbook/xml/4.5" \ "file:///usr/share/xml/docbook/xml-dtd-4.5" \ - "$root/etc/xml/docbook-xml" + "/etc/xml/docbook-xml" - if [ -f $root/etc/xml/catalog ]; then - xmlcatalog --noout $root/etc/xml/catalog + if [ -f "$1/etc/xml/catalog" ]; then + xmlcatalog --noout "$1/etc/xml/catalog" else - xmlcatalog --noout --create $root/etc/xml/catalog + xmlcatalog --noout --create "$1/etc/xml/catalog" fi - xmlcatalog --noout --add "delegatePublic" \ + chroot "$1/" xmlcatalog --noout --add "delegatePublic" \ "-//OASIS//ENTITIES DocBook XML" \ "file:///etc/xml/docbook-xml" \ - "$root/etc/xml/catalog" - xmlcatalog --noout --add "delegatePublic" \ + "/etc/xml/catalog" + chroot "$1/" xmlcatalog --noout --add "delegatePublic" \ "-//OASIS//DTD DocBook XML" \ "file:///etc/xml/docbook-xml" \ - "$root/etc/xml/catalog" - xmlcatalog --noout --add "delegateSystem" \ + "/etc/xml/catalog" + chroot "$1/" xmlcatalog --noout --add "delegateSystem" \ "http://www.oasis-open.org/docbook/" \ "file:///etc/xml/docbook-xml" \ - "$root/etc/xml/catalog" - xmlcatalog --noout --add "delegateURI" \ + "/etc/xml/catalog" + chroot "$1/" xmlcatalog --noout --add "delegateURI" \ "http://www.oasis-open.org/docbook/" \ "file:///etc/xml/docbook-xml" \ - "$root/etc/xml/catalog" + "/etc/xml/catalog" + if [ "$1" ]; then + mv -f "$1/etc/resolv.conf.$$" "$1/etc/recolv.conf" 2> /dev/null + fi } post_remove() { - root=$1 - xmlcatalog --noout --del file:///etc/xml/docbook-xml $root/etc/xml/catalog + xmlcatalog --noout --del file:///etc/xml/docbook-xml "$1/etc/xml/catalog" } diff -r 67528625d306 -r 9e01bc6321ea docbook-xsl-ns/receipt --- a/docbook-xsl-ns/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/docbook-xsl-ns/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -40,32 +40,39 @@ post_install() { echo -n "Processing post-install commands..." + if [ "$1" ]; then + mv -f "$1/etc/resolv.conf" "$1/etc/recolv.conf.$$" 2> /dev/null + cp /etc/resolv.conf "$1/etc/resolv.conf" + fi # Create a /etc/xml/catalog file - if [ ! -d $1/etc/xml ]; then install -v -m755 -d $1/etc/xml; fi && - if [ ! -f $1/etc/xml/catalog ]; then - xmlcatalog --noout --create $1/etc/xml/catalog + if [ ! -d "$1/etc/xml" ]; then install -v -m755 -d "$1/etc/xml"; fi && + if [ ! -f "$1/etc/xml/catalog" ]; then + chroot "$1/" xmlcatalog --noout --create /etc/xml/catalog fi && - xmlcatalog --noout --add "rewriteSystem" \ + chroot "$1/" xmlcatalog --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl-ns/$VERSION" \ "/usr/share/xml/docbook/stylesheet/$PACKAGE/catalog.xml" \ - $1/etc/xml/catalog && + /etc/xml/catalog && - xmlcatalog --noout --add "rewriteURI" \ + chroot "$1/" xmlcatalog --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl-ns/$VERSION" \ "/usr/share/xml/docbook/stylesheet/$PACKAGE/catalog.xml" \ - $1/etc/xml/catalog && + /etc/xml/catalog && - xmlcatalog --noout --add "rewriteSystem" \ + chroot "$1/" xmlcatalog --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl-ns/current" \ "/usr/share/xml/docbook/stylesheet/$PACKAGE/catalog.xml" \ - $1/etc/xml/catalog && + /etc/xml/catalog && - xmlcatalog --noout --add "rewriteURI" \ + chroot "$1/" xmlcatalog --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl-ns/current" \ "/usr/share/xml/docbook/stylesheet/$PACKAGE/catalog.xml" \ - $1/etc/xml/catalog + /etc/xml/catalog status + if [ "$1" ]; then + mv -f "$1/etc/resolv.conf.$$" "$1/etc/recolv.conf" 2> /dev/null + fi } diff -r 67528625d306 -r 9e01bc6321ea docbook-xsl/receipt --- a/docbook-xsl/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/docbook-xsl/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -41,36 +41,43 @@ post_install() { echo -n "Processing post-install commands..." + if [ "$1" ]; then + mv -f "$1/etc/resolv.conf" "$1/etc/recolv.conf.$$" 2> /dev/null + cp /etc/resolv.conf "$1/etc/resolv.conf" + fi # Create a /etc/xml/catalog file - if [ ! -d $1/etc/xml ]; then install -v -m755 -d $1/etc/xml; fi && - if [ ! -f $1/etc/xml/catalog ]; then - xmlcatalog --noout --create $1/etc/xml/catalog + if [ ! -d "$1/etc/xml" ]; then install -v -m755 -d "$1/etc/xml"; fi && + if [ ! -f "$1/etc/xml/catalog" ]; then + chroot "$1/" xmlcatalog --noout --create /etc/xml/catalog fi && - xmlcatalog --noout --add "rewriteSystem" \ + chroot "$1/" xmlcatalog --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/$VERSION" \ "/usr/share/xml/docbook/stylesheet/$PACKAGE/catalog.xml" \ - $1/etc/xml/catalog && + /etc/xml/catalog && - xmlcatalog --noout --add "rewriteURI" \ + chroot "$1/" xmlcatalog --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl/$VERSION" \ "/usr/share/xml/docbook/stylesheet/$PACKAGE/catalog.xml" \ - $1/etc/xml/catalog && + /etc/xml/catalog && - xmlcatalog --noout --add "rewriteSystem" \ + chroot "$1/" xmlcatalog --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/current" \ "/usr/share/xml/docbook/stylesheet/$PACKAGE/catalog.xml" \ - $1/etc/xml/catalog && + /etc/xml/catalog && - xmlcatalog --noout --add "rewriteURI" \ + chroot "$1/" xmlcatalog --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl/current" \ "/usr/share/xml/docbook/stylesheet/$PACKAGE/catalog.xml" \ - $1/etc/xml/catalog + /etc/xml/catalog # link nwalsh dir - cd $1/usr/share/xml/docbook/stylesheet + cd "$1/usr/share/xml/docbook/stylesheet" ln -s $PACKAGE nwalsh status + if [ "$1" ]; then + mv -f "$1/etc/resolv.conf.$$" "$1/etc/recolv.conf" 2> /dev/null + fi } diff -r 67528625d306 -r 9e01bc6321ea dolibarr/receipt --- a/dolibarr/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/dolibarr/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -72,9 +72,9 @@ db_password=dolibarr # Configure apache server - if [ -f $1/etc/apache/httpd.conf ]; then - if [ ! -f $1/etc/apache/conf.d/dolibarr.conf ]; then - cat > $1/etc/apache/conf.d/dolibarr.conf < "$1/etc/apache/conf.d/dolibarr.conf" < Alias /dolibarr /usr/share/dolibarr/htdocs @@ -95,7 +95,7 @@ fi # Configure every thing. - if [ -z $1 ]; then + if [ -z "$1" ]; then if ( ! mysqladmin -s ping > /dev/null ); then echo "Starting MySQL server" ( /etc/init.d/mysql start ; status ) || exit diff -r 67528625d306 -r 9e01bc6321ea dooble/receipt --- a/dooble/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/dooble/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -63,12 +63,12 @@ post_install() { - for i in $(ls $1/home 2> /dev/null); do - [ -f /home/$i/.dooble/Dooble/Dooble.ini ] && continue - mkdir -p $1/home/$i/.dooble/Dooble - cp $1/usr/share/dooble/Dooble.ini $1/home/$i/.dooble/Dooble - rm $1/home/$i/.local/share/applications/dooble.desktop - chroot $1/ chown -R $(stat -c "%u.%g" $1/home/$i) /home/$i/.dooble + for i in $(ls "$1/home" 2> /dev/null); do + [ -f "/home/$i/.dooble/Dooble/Dooble.ini" ] && continue + mkdir -p "$1/home/$i/.dooble/Dooble" + cp "$1/usr/share/dooble/Dooble.ini" "$1/home/$i/.dooble/Dooble" + rm "$1/home/$i/.local/share/applications/dooble.desktop" + chroot "$1/" chown -R $(stat -c "%u.%g" "$1/home/$i") "/home/$i/.dooble" done } diff -r 67528625d306 -r 9e01bc6321ea dovecot/receipt --- a/dovecot/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/dovecot/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -86,17 +86,17 @@ user=dovecot group=dovecot - if ! grep -q $user $1/etc/passwd; then + if ! grep -q $user "$1/etc/passwd"; then echo -n "Adding user/group $user..." - chroot $1/ addgroup -g 76 -S $group - chroot $1/ adduser -u 76 -S -D -H -G $group $user - chroot $1/ adduser -u 74 -S -D -H -G nogroup dovenull + chroot "$1/" addgroup -g 76 -S $group + chroot "$1/" adduser -u 76 -S -D -H -G $group $user + chroot "$1/" adduser -u 74 -S -D -H -G nogroup dovenull status fi # Set perms for files and directories - chroot $1/ chown -R ${user}.${group} /var/log/${user} \ + chroot "$1/" chown -R ${user}.${group} /var/log/${user} \ cat <> $1/etc/inetd.conf <> "$1/etc/inetd.conf" < $1/proc/sys/fs/binfmt_misc/i86-elks - sed -i '/binfmt_misc/{N;/:i86-elks:M:/d}' $1/etc/init.d/local.sh + echo -1 > "$1/proc/sys/fs/binfmt_misc/i86-elks" + sed -i '/binfmt_misc/{N;/:i86-elks:M:/d}' "$1/etc/init.d/local.sh" } diff -r 67528625d306 -r 9e01bc6321ea emacs/receipt --- a/emacs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/emacs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -184,7 +184,7 @@ post_install() { - cd $1/usr/share/$PACKAGE/$VERSION/site-lisp + cd "$1/usr/share/$PACKAGE/$VERSION/site-lisp" cat <<-EOF >site-start.el ;; site-start.el for SliTaz -*- no-byte-compile: t -*- ;; @@ -200,13 +200,13 @@ cat site-start.d/$file >> site-start.el done # linking /usr/bin/emacs to new version - [ -h $1/usr/bin/emacs ] && rm -f $1/usr/bin/emacs - ln -s /usr/bin/emacs-$VERSION $1/usr/bin/emacs + [ -h "$1/usr/bin/emacs" ] && rm -f "$1/usr/bin/emacs" + ln -s /usr/bin/emacs-$VERSION "$1/usr/bin/emacs" } post_remove() { - rm -rf $1/usr/share/emacs - rm -rf $1/usr/lib/emacs - rm -f $1/usr/bin/emacs + rm -rf "$1/usr/share/emacs" + rm -rf "$1/usr/lib/emacs" + rm -f "$1/usr/bin/emacs" } \ No newline at end of file diff -r 67528625d306 -r 9e01bc6321ea enlightenment-pam/receipt --- a/enlightenment-pam/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/enlightenment-pam/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -64,7 +64,7 @@ post_install() { - res=$(grep ^session <$1/etc/slim.conf | sed s/"sessions. *"// \ + res=$(grep ^session < "$1/etc/slim.conf" | sed s/"sessions. *"// \ | sed s/,e17//) # Adding WM to SLIM available sessions. if ! echo "$res" | grep -q enlightenment; then @@ -78,7 +78,7 @@ post_remove() { # Remove WM from SLIM available sessions. - if grep -q enlightenment $1/etc/slim.conf; then - sed -i s/enlightenement,// $1/etc/slim.conf + if grep -q enlightenment "$1/etc/slim.conf"; then + sed -i s/enlightenement,// "$1/etc/slim.conf" fi } diff -r 67528625d306 -r 9e01bc6321ea enlightenment/receipt --- a/enlightenment/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/enlightenment/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -64,7 +64,7 @@ post_install() { - res=$(grep ^session <$1/etc/slim.conf | sed s/"sessions. *"// \ + res=$(grep ^session < "$1/etc/slim.conf" | sed s/"sessions. *"// \ | sed s/,e17//) # Adding WM to SLIM available sessions. if ! echo "$res" | grep -q enlightenment; then @@ -78,7 +78,7 @@ post_remove() { # Remove WM from SLIM available sessions. - if grep -q enlightenment $1/etc/slim.conf; then - sed -i s/enlightenment,// $1/etc/slim.conf + if grep -q enlightenment "$1/etc/slim.conf"; then + sed -i s/enlightenment,// "$1/etc/slim.conf" fi } diff -r 67528625d306 -r 9e01bc6321ea enna/receipt --- a/enna/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/enna/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -90,7 +90,7 @@ post_install() { - for f in $(cd $1/ ; find usr/lib/ -name "*ver-svn-05*" ! -path */enlightenment/*); do - ln -s /$f /$(echo $f|sed s/-05/-03/); + for f in $(cd "$1/" ; find usr/lib/ -name "*ver-svn-05*" ! -path */enlightenment/*); do + ln -s /$f "$1/$(echo $f|sed s/-05/-03/)"; done } diff -r 67528625d306 -r 9e01bc6321ea eom/receipt --- a/eom/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/eom/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -42,11 +42,11 @@ post_install() { echo "Processing post-install commands..." - chroot $1/ /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas + chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas } post_remove() { echo "Processing post-remove commands..." - chroot $1/ /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas + chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas } diff -r 67528625d306 -r 9e01bc6321ea epdfview-cups/receipt --- a/epdfview-cups/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/epdfview-cups/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -47,5 +47,5 @@ # Pre install commands for Tazpkg. pre_install() { - [ -x $1/usr/bin/epdfview ] && yes y | tazpkg remove epdfview + [ -x "$1/usr/bin/epdfview" ] && yes y | tazpkg remove epdfview } diff -r 67528625d306 -r 9e01bc6321ea eudev/receipt --- a/eudev/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/eudev/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -63,7 +63,7 @@ { object=$2 [ -n "$object" ] || object=GROUP - grep $object $1/etc/udev/rules.d/* | \ + grep $object "$1"/etc/udev/rules.d/* | \ sed 's/.*GROUP="\([a-zA-Z0-9]*\)".*/\1/' | sort | uniq } diff -r 67528625d306 -r 9e01bc6321ea ffmpeg-compat/receipt --- a/ffmpeg-compat/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/ffmpeg-compat/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -70,10 +70,10 @@ post_install() { - echo "/usr/lib/ffmpeg-compat" >> $1/etc/ld.so.conf + echo "/usr/lib/ffmpeg-compat" >> "$1/etc/ld.so.conf" } post_remove() { - sed -i '#/usr/lib/ffmpeg-compat#'d $1/etc/ld.so.conf + sed -i '#/usr/lib/ffmpeg-compat#'d "$1/etc/ld.so.conf" } diff -r 67528625d306 -r 9e01bc6321ea findutils/receipt --- a/findutils/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/findutils/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -38,8 +38,8 @@ # Remove Busybox symlink before installing pre_install() { - rm -f $1/usr/bin/find - rm -f $1/usr/bin/xargs + rm -f "$1/usr/bin/find" + rm -f "$1/usr/bin/xargs" } post_remove() diff -r 67528625d306 -r 9e01bc6321ea firefox-dev/receipt --- a/firefox-dev/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/firefox-dev/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -58,9 +58,9 @@ { for i in usr/share/idl/firefox- usr/include/firefox- \ usr/lib/firefox-devel- ; do - for j in $(ls -d $1/$i* 2>/dev/null); do + for j in $(ls -d "$1"/$i* 2>/dev/null); do [ "${j##*-}" = "$VERSION" ] && continue - [ ! -d $j ] || rm -rf $j + [ ! -d "$j" ] || rm -rf "$j" done done } diff -r 67528625d306 -r 9e01bc6321ea fluxbox/receipt --- a/fluxbox/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/fluxbox/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -61,11 +61,11 @@ post_install() { - res=$(cat $1/etc/slim.conf | grep ^session | sed s/"sessions. *"//) + res=$(cat "$1/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/" "$1/etc/slim.conf" status fi } @@ -73,8 +73,8 @@ 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 "$1/etc/slim.conf"; then + sed -i s/,$PACKAGE// "$1/etc/slim.conf" fi } diff -r 67528625d306 -r 9e01bc6321ea foomatic-db-engine/receipt --- a/foomatic-db-engine/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/foomatic-db-engine/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -46,5 +46,5 @@ pre_install() { - rm -rf $1/usr/lib/perl5/site_perl/current + rm -rf "$1/usr/lib/perl5/site_perl/current" } diff -r 67528625d306 -r 9e01bc6321ea foomatic-db-nonfree/receipt --- a/foomatic-db-nonfree/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/foomatic-db-nonfree/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -62,7 +62,7 @@ echo "The license is stored in /usr/share/licenses/$PACKAGE " echo -n "Would you like to read the license (y/N) : "; read anser if [ "$anser" = "y" ]; then - cat $1/usr/share/licenses/"$PACKAGE"/COPYING | more + more < "$1/usr/share/licenses/$PACKAGE/COPYING" echo "" fi echo "================================================================================" diff -r 67528625d306 -r 9e01bc6321ea fpc/receipt --- a/fpc/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/fpc/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -66,13 +66,13 @@ post_install() { echo"Processing postinstall commands..." - if [ ! -f $1/etc/fpc.cfg ]; then - chroot $1/ fpcmkcfg > /etc/fpc.cfg + if [ ! -f "$1/etc/fpc.cfg" ]; then + chroot "$1/" fpcmkcfg > /etc/fpc.cfg fi # Fix units search path - sed -i -e 's!^-Fu/units/$fpctarget!-Fu/usr/lib/fpc/2.6.4/units/$fpctarget!' \ - -e 's!^-Fu/units/$fpctarget/*!-Fu/usr/lib/fpc/2.6.4/units/$fpctarget/*!' \ - -e 's!^-Fu/units/$fpctarget/rtl!-Fu/usr/lib/fpc/2.6.4/units/$fpctarget/rtl!' $1/etc/fpc.cfg + sed -i -e 's!^-Fu/units/$fpctarget!-Fu/usr/lib/fpc/'$VERSION'/units/$fpctarget!' \ + -e 's!^-Fu/units/$fpctarget/*!-Fu/usr/lib/fpc/'$VERSION'/units/$fpctarget/*!' \ + -e 's!^-Fu/units/$fpctarget/rtl!-Fu/usr/lib/fpc/'$VERSION'/units/$fpctarget/rtl!' "$1/etc/fpc.cfg" } diff -r 67528625d306 -r 9e01bc6321ea freepats/receipt --- a/freepats/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/freepats/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -24,7 +24,7 @@ post_install() { # Update timidity.cfg - cat >> $1/usr/share/timidity/timidity.cfg <> "$1/usr/share/timidity/timidity.cfg" < "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/dialupadmin/" => "/usr/share/dialup_admin/htdocs/",|g' -i $1/etc/lighttpd/lighttpd.conf + if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then + if ! grep -q /usr/share/dialup_admin/ "$1/etc/lighttpd/lighttpd.conf"; then + sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/dialupadmin/" => "/usr/share/dialup_admin/htdocs/",|g' -i "$1/etc/lighttpd/lighttpd.conf" if [ -z "$1" ]; then # Start Web server. /etc/init.d/lighttpd stop @@ -37,9 +37,9 @@ fi fi # Configure apache server - if [ -f $1/etc/apache/httpd.conf ]; then - if [ ! -f $1/etc/apache/conf.d/dialupadmin ]; then - cat > $1/etc/apache/conf.d/dialupadmin < "$1/etc/apache/conf.d/dialupadmin" < Alias /dialupadmin /usr/share/dialup_admin/htdocs diff -r 67528625d306 -r 9e01bc6321ea freetype-infinality/receipt --- a/freetype-infinality/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/freetype-infinality/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -50,21 +50,21 @@ post_install() { # SliTaz not support /etc/profile.d/ by default, but use /etc/profile file - cat >> $1/etc/profile << EOT + cat >> "$1/etc/profile" << EOT # freetype-infinality profile settings . /etc/profile.d/infinality-settings.sh EOT # add patched libs to loader config - echo '/usr/lib/freetype-infinality' >> $1/etc/ld.so.conf + echo '/usr/lib/freetype-infinality' >> "$1/etc/ld.so.conf" chroot "$1/" ldconfig echo 'Now you can log out/in to take effect on all your apps' } post_remove() { - sed -i '/infinality/d' $1/etc/profile - sed -i '/freetype-infinality/d' $1/etc/ld.so.conf + sed -i '/infinality/d' "$1/etc/profile" + sed -i '/freetype-infinality/d' "$1/etc/ld.so.conf" chroot "$1/" ldconfig } diff -r 67528625d306 -r 9e01bc6321ea gawk/receipt --- a/gawk/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/gawk/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -43,12 +43,10 @@ # We must remove all Busybox symlink before installing. pre_install() { - local root - root=$1 - rm -f $root/usr/bin/awk + rm -f "$1/usr/bin/awk" } post_remove() { - ln -s /bin/busybox $1/usr/bin/awk + ln -s /bin/busybox "$1/usr/bin/awk" } diff -r 67528625d306 -r 9e01bc6321ea gcc+gcj/receipt --- a/gcc+gcj/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/gcc+gcj/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -96,13 +96,11 @@ # Post install commands for Tazpkg. post_install() { - local root - root=$1 echo "Processing post-install commands..." - if [ ! -f "$root/lib/cpp" ] ; then - ln -s ../usr/bin/cpp $root/lib + if [ ! -f "$1/lib/cpp" ] ; then + ln -s ../usr/bin/cpp "$1/lib" fi - if [ ! -f "$root/usr/bin/cc" ] ; then - ln -s gcc $root/usr/bin/cc + if [ ! -f "$1/usr/bin/cc" ] ; then + ln -s gcc "$1/usr/bin/cc" fi } diff -r 67528625d306 -r 9e01bc6321ea gcc/receipt --- a/gcc/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/gcc/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -118,11 +118,9 @@ # Post install commands for Tazpkg. post_install() { - local root - root=$1 echo "Processing post-install commands..." - [ -f "$root/lib/cpp" ] || - ln -s ../usr/bin/cpp $root/lib - [ -f "$root/usr/bin/cc" ] || - ln -s gcc $root/usr/bin/cc + [ -f "$1/lib/cpp" ] || + ln -s ../usr/bin/cpp "$1/lib" + [ -f "$1/usr/bin/cc" ] || + ln -s gcc "$1/usr/bin/cc" } diff -r 67528625d306 -r 9e01bc6321ea gcc49-lib-base/receipt --- a/gcc49-lib-base/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/gcc49-lib-base/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -21,7 +21,7 @@ post_remove() { - cd $1/usr/lib + cd "$1/usr/lib" ln -s libstdc++.so.6.*.* libstdc++.so.6 ln -s libstdc++.so.6.*.* libstdc++.so cd - >/dev/null diff -r 67528625d306 -r 9e01bc6321ea gecko-mediaplayer/receipt --- a/gecko-mediaplayer/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/gecko-mediaplayer/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -44,10 +44,8 @@ post_install() { echo -n "Processing post install commands..." - local root - root=$1 - for i in $root/usr/lib/mozilla/plugins/$PACKAGE*.so ; do - ln -s $i $root/usr/lib/firefox*/plugins + for i in "$1"/usr/lib/mozilla/plugins/$PACKAGE*.so ; do + ln -s "$i" "$1"/usr/lib/firefox*/plugins done status } diff -r 67528625d306 -r 9e01bc6321ea get-wifi-firmware/receipt --- a/get-wifi-firmware/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/get-wifi-firmware/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -19,9 +19,9 @@ post_install() { install_resolver=false - [ -s /etc/resolv.conf -a ! -s $1/etc/resolv.conf ] && install_resolver=true - $install_resolver && cp /etc/resolv.conf $1/etc/resolv.conf + [ -s /etc/resolv.conf -a ! -s "$1/etc/resolv.conf" ] && install_resolver=true + $install_resolver && cp /etc/resolv.conf "$1/etc/resolv.conf" # directly support some freely distributable firmware drivers - chroot $1/ /usr/bin/get-wifi-firmware --get-free-firmware - $install_resolver && rm -f $1/etc/resolv.conf + chroot "$1/" /usr/bin/get-wifi-firmware --get-free-firmware + $install_resolver && rm -f "$1/etc/resolv.conf" } diff -r 67528625d306 -r 9e01bc6321ea git/receipt --- a/git/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/git/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -43,13 +43,11 @@ # edit daemons.conf. post_install() { - local root - root=$1 - if ! grep -q 'GIT_OPTIONS' $root/etc/daemons.conf; then - mkdir -p $root/var/www/git - echo '# Git daemon options.' >> $root/etc/daemons.conf - echo 'GIT_REPO="/var/www/git/"' >> $root/etc/daemons.conf - echo 'GIT_OPTIONS="--detach --syslog --verbose --base-path=$GIT_REPO $GIT_REPO"' >> $root/etc/daemons.conf - echo '' >> $root/etc/daemons.conf + if ! grep -q 'GIT_OPTIONS' "$1/etc/daemons.conf"; then + mkdir -p "$1/var/www/git" + echo '# Git daemon options.' >> "$1/etc/daemons.conf" + echo 'GIT_REPO="/var/www/git/"' >> "$1/etc/daemons.conf" + echo 'GIT_OPTIONS="--detach --syslog --verbose --base-path=$GIT_REPO $GIT_REPO"' >> "$1/etc/daemons.conf" + echo '' >> "$1/etc/daemons.conf" fi } diff -r 67528625d306 -r 9e01bc6321ea glib-dev/receipt --- a/glib-dev/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/glib-dev/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -42,6 +42,6 @@ } post_install() { - cd $1/usr/share/gdb/auto-load + cd "$1/usr/share/gdb/auto-load" for i in $(ls *.-py);do mv -f $i ${i//-.-/.};done } diff -r 67528625d306 -r 9e01bc6321ea glpi/receipt --- a/glpi/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/glpi/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -62,9 +62,9 @@ post_install() { # Configure apache server - if [ -f $1/etc/apache/httpd.conf ]; then - if [ ! -f $1/etc/apache/conf.d/glpi ]; then - cat > $1/etc/apache/conf.d/glpi < "$1/etc/apache/conf.d/glpi" < Alias /glpi /usr/share/glpi/ @@ -109,7 +109,7 @@ fi # Configure every thing for glpi. - if [ -z $1 ]; then + if [ -z "$1" ]; then if ( ! mysqladmin -s ping > /dev/null ); then echo "Starting MySQL server" ( /etc/init.d/mysql start ; status ) || exit @@ -157,4 +157,3 @@ esac } - diff -r 67528625d306 -r 9e01bc6321ea gnome-calculator/receipt --- a/gnome-calculator/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/gnome-calculator/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -41,11 +41,11 @@ post_install() { echo "Processing post-install commands..." - chroot $1/ /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas + chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas } post_remove() { echo "Processing post-remove commands..." - chroot $1/ /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas + chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas } diff -r 67528625d306 -r 9e01bc6321ea gnu-netcat/receipt --- a/gnu-netcat/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/gnu-netcat/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -35,15 +35,13 @@ # pre_install() { - local root - root=$1 echo "Processing pre-install commands..." echo -n "Removing all Busybox replaced utils... " - rm -f $root/usr/bin/nc + rm -f "$1/usr/bin/nc" status } post_remove() { - ln -s /bin/busybox $1/usr/bin/nc + ln -s /bin/busybox "$1/usr/bin/nc" } \ No newline at end of file diff -r 67528625d306 -r 9e01bc6321ea grep/receipt --- a/grep/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/grep/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -32,16 +32,14 @@ # post_install() { - local root - root=$1 echo "Processing pre-install commands..." echo -n "Removing all Busybox replaced utils... " for i in grep egrep fgrep ; do - bb=$root$(busybox grep bin/$i$ \ - $root/var/lib/tazpkg/installed/busybox*/files.list | sed q) - readlink $bb 2> /dev/null | grep -q busybox || continue - rm -f $bb - ln -s /usr/bin/$i $bb + bb="$1$(busybox grep bin/$i$ \ + "$1"/var/lib/tazpkg/installed/busybox*/files.list | sed q)" + readlink "$bb" 2> /dev/null | grep -q busybox || continue + rm -f "$bb" + ln -s /usr/bin/$i "$bb" done status } @@ -49,10 +47,10 @@ post_remove() { for i in grep egrep fgrep ; do - bb=$root$(busybox grep bin/$i$ \ - $root/var/lib/tazpkg/installed/busybox*/files.list | sed q) - rm -f $bb - ln -s /bin/busybox $bb + bb="$1$(busybox grep bin/$i$ \ + "$1"/var/lib/tazpkg/installed/busybox*/files.list | sed q)" + rm -f "$bb" + ln -s /bin/busybox "$bb" done } diff -r 67528625d306 -r 9e01bc6321ea grooms/receipt --- a/grooms/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/grooms/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -29,9 +29,9 @@ post_install() { # Configure lighttpd server - if [ -f $1/etc/lighttpd/lighttpd.conf ]; then - if ! grep -q /var/lib/grooms $1/etc/lighttpd/lighttpd.conf; then - sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/grooms/" => "/var/lib/grooms/",|g' -i $1/etc/lighttpd/lighttpd.conf + if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then + if ! grep -q /var/lib/grooms "$1/etc/lighttpd/lighttpd.conf"; then + sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/grooms/" => "/var/lib/grooms/",|g' -i "$1/etc/lighttpd/lighttpd.conf" if [ -z "$1" ]; then # Start Web server. /etc/init.d/lighttpd stop @@ -40,9 +40,9 @@ fi fi # Configure apache server - if [ -f $1/etc/apache/httpd.conf ]; then - if [ ! -f $1/etc/apache/conf.d/grooms ]; then - cat > $1/etc/apache/conf.d/grooms < "$1/etc/apache/conf.d/grooms" < Alias /grooms /var/lib/grooms diff -r 67528625d306 -r 9e01bc6321ea gtk-clearlooks/receipt --- a/gtk-clearlooks/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/gtk-clearlooks/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -30,6 +30,6 @@ { for t in listviewitemstyle menuitemstyle progressbarstyle sunkenmenubar do - sed "s/$t/#$t/" -i $1/usr/share/themes/SliTaz*/gtk-2.0/gtkrc + sed "s/$t/#$t/" -i "$1"/usr/share/themes/SliTaz*/gtk-2.0/gtkrc done } diff -r 67528625d306 -r 9e01bc6321ea gvfs-smb/receipt --- a/gvfs-smb/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/gvfs-smb/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -21,11 +21,11 @@ post_install() { echo "Processing post-install commands..." - chroot $1/ /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas + chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas } post_remove() { echo "Processing post-remove commands..." - chroot $1/ /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas + chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas } diff -r 67528625d306 -r 9e01bc6321ea gvim/receipt --- a/gvim/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/gvim/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -60,10 +60,7 @@ post_install() { - local root - root=$1 - - cmd=$(readlink $root/bin/vi) + cmd=$(readlink "$1/bin/vi") if [ ! "$cmd" == '/usr/bin/vim' ]; then echo "" echo "**** Actual VI link : $cmd" @@ -72,7 +69,7 @@ if [ "$answer" == 'y' ]; then echo "" echo -n "Removing vi link to make a new one pointing on /usr/bin/vim..." - rm $root/bin/vi && ln -sf $root/usr/bin/vim $root/bin/vi + rm "$1/bin/vi" && ln -sf /usr/bin/vim "$1/bin/vi" status else echo "" @@ -84,5 +81,5 @@ post_remove() { # restore previous symlink - ln -sf busybox $1/bin/vi + ln -sf busybox "$1/bin/vi" } diff -r 67528625d306 -r 9e01bc6321ea gzip-full/receipt --- a/gzip-full/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/gzip-full/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -25,14 +25,14 @@ pre_install() { echo -n "Removing Busybox uncompress and zcat utilities... " - rm -f $1/bin/uncompress $1/bin/zcat + rm -f "$1/bin/uncompress" "$1/bin/zcat" status } post_remove() { echo -n "Restoring Busybox uncompress and zcat utilities... " - ln -s busybox $1/bin/uncompress - ln -s busybox $1/bin/zcat + ln -s busybox "$1/bin/uncompress" + ln -s busybox "$1/bin/zcat" status } diff -r 67528625d306 -r 9e01bc6321ea gzip/receipt --- a/gzip/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/gzip/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -38,14 +38,14 @@ pre_install() { echo -n "Removing Busybox gzip and gunzip utilities... " - rm -f $1/bin/gzip $1/bin/gunzip + rm -f "$1/bin/gzip" "$1/bin/gunzip" status } post_remove() { echo -n "Restoring Busybox gzip and gunzip utilities... " - ln -s busybox $1/bin/gzip - ln -s busybox $1/bin/gunzip + ln -s busybox "$1/bin/gzip" + ln -s busybox "$1/bin/gunzip" status } diff -r 67528625d306 -r 9e01bc6321ea hal/receipt --- a/hal/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/hal/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -96,21 +96,19 @@ pre_install() { - local root - root=$1 # Go for echoing on configuration files if any haldeamon user # was found. - if ! grep -q 'haldaemon' $root/etc/passwd; then + if ! grep -q 'haldaemon' "$1/etc/passwd"; then echo -n "Adding user: messagebus..." - echo 'haldaemon:x:26:26:HAL Daemon User:/dev/null:/bin/false' >> $root/etc/passwd - echo 'haldaemon:!:14013:0:99999:7:::' >> $root/etc/shadow - echo 'haldaemon:x:26:' >> $root/etc/group - echo 'haldaemon:!::' >> $root/etc/gshadow + echo 'haldaemon:x:26:26:HAL Daemon User:/dev/null:/bin/false' >> "$1/etc/passwd" + echo 'haldaemon:!:14013:0:99999:7:::' >> "$1/etc/shadow" + echo 'haldaemon:x:26:' >> "$1/etc/group" + echo 'haldaemon:!::' >> "$1/etc/gshadow" status fi - if ! grep -q ^HALD_OPTIONS $root/etc/daemons.conf; then - echo -n "Configuring $root/etc/daemons.conf..." - cat >> $root/etc/daemons.conf << "EOT" + if ! grep -q ^HALD_OPTIONS "$1/etc/daemons.conf"; then + echo -n "Configuring /etc/daemons.conf..." + cat >> "$1/etc/daemons.conf" << "EOT" # HAL daemon options. HALD_OPTIONS="--daemon=yes" diff -r 67528625d306 -r 9e01bc6321ea hardware-ibm-6272/receipt --- a/hardware-ibm-6272/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/hardware-ibm-6272/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -43,11 +43,11 @@ # Pre and post install commands for Tazpkg. pre_remove() { - sed -i 's/pnp.sh //' $1/etc/rcS.conf + sed -i 's/pnp.sh //' "$1/etc/rcS.conf" } post_install() { - grep pnp.sh $1/etc/rcS.conf || - sed -i 's/RUN_SCRIPTS="/&pnp.sh /' $1/etc/rcS.conf + grep pnp.sh "$1/etc/rcS.conf" || + sed -i 's/RUN_SCRIPTS="/&pnp.sh /' "$1/etc/rcS.conf" } diff -r 67528625d306 -r 9e01bc6321ea hardware-thinkpad-600e/receipt --- a/hardware-thinkpad-600e/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/hardware-thinkpad-600e/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -20,8 +20,8 @@ post_install() { for i in thinkpad_acpi snd_cs46xx yenta_socket ; do - grep -q $i $1/etc/rcS.conf || - sed -i "s/LOAD_MODULES=\"/&$i /" $i $1/etc/rcS.conf + grep -q $i "$1/etc/rcS.conf" || + sed -i "s/LOAD_MODULES=\"/&$i /" $i "$1/etc/rcS.conf" [ -n "$1" ] || modprobe $i done # FIXME update /etc/modprobe.d/ ? @@ -29,9 +29,9 @@ # modprobe snd-cs4232 port=0x530 cport=0x120 irq=5 dma1=1 dma2=0 isapnp=0 # Video: remove 24bits (use 1024x768x16), neomagic driver - sed -i 's/vesa/neomagic/;/Display/{NNN/24$/d}' $1/etc/X11/xorg.conf - sed -i '/Display/{NNNN/24$/d}' $1/etc/X11/xorg.conf.d/70-Screen.conf - sed -i 's/vesa/neomagic/' $1/etc/X11/xorg.conf.d/60-Device.conf + sed -i 's/vesa/neomagic/;/Display/{NNN/24$/d}' "$1/etc/X11/xorg.conf" + sed -i '/Display/{NNNN/24$/d}' "$1/etc/X11/xorg.conf.d/70-Screen.conf" + sed -i 's/vesa/neomagic/' "$1/etc/X11/xorg.conf.d/60-Device.conf" cat <> $1/etc/inittab << EOT + grep -q ^uucp: "$1/etc/group" || chroot "$1/" addgroup uucp + touch "$1/var/log/iaxmodem/ttyIAX0" "$1/var/log/iaxmodem/iaxmodem" + grep iaxmodem "$1/etc/inittab" || cat >> "$1/etc/inittab" << EOT ::respawn:/usr/bin/iaxmodem ttyIAX0 > /var/log/iaxmodem.log 2>&1 ::respawn:/usr/sbin/faxgetty ttyIAX0 EOT - [ -n "$1" ] || kill -1 1 + [ "$1" ] || kill -1 1 } diff -r 67528625d306 -r 9e01bc6321ea icedtea6-jre/receipt --- a/icedtea6-jre/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/icedtea6-jre/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -25,10 +25,10 @@ # Post install/remove commands for Tazpkg. post_install() { - ln -sf /usr/lib/jvm/java-icedtea/bin/java /usr/bin/java + ln -sf /usr/lib/jvm/java-icedtea/bin/java "$1/usr/bin/java" } post_remove() { - rm -f $1/usr/bin/java + rm -f "$1/usr/bin/java" } diff -r 67528625d306 -r 9e01bc6321ea iron-linux/receipt --- a/iron-linux/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/iron-linux/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -32,12 +32,12 @@ # Create a link to /usr/bin/iron. post_install() { - ln -s $1/usr/lib/iron-linux/iron $1/usr/bin/iron + ln -s /usr/lib/iron-linux/iron "$1/usr/bin/iron" } # Remove link. post_remove() { - rm $1/usr/bin/iron + rm "$1/usr/bin/iron" } diff -r 67528625d306 -r 9e01bc6321ea jwm/receipt --- a/jwm/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/jwm/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -62,14 +62,14 @@ post_install() { if [ -d "$1/etc/jwm" ]; then - echo "Removing old system wide configs: $1/etc/jwm" - rm -rf $1/etc/jwm + echo "Removing old system wide configs: /etc/jwm" + rm -rf "$1/etc/jwm" fi - res=$(cat $1/etc/slim.conf | grep ^session | sed s/"sessions. *"//) + res=$(cat "$1/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/" "$1/etc/slim.conf" status fi true @@ -78,7 +78,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 "$1/etc/slim.conf"; then + sed -i s/,$PACKAGE// "$1/etc/slim.conf" fi } diff -r 67528625d306 -r 9e01bc6321ea karmen/receipt --- a/karmen/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/karmen/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -38,11 +38,11 @@ post_install() { - res=`cat $1/etc/slim.conf | grep ^session | sed s/"sessions. *"//` + res=$(cat "$1/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/" "$1/etc/slim.conf" status fi } @@ -50,7 +50,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 "$1/etc/slim.conf"; then + sed -i s/,$PACKAGE// "$1/etc/slim.conf" fi } diff -r 67528625d306 -r 9e01bc6321ea kismet/receipt --- a/kismet/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/kismet/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -43,23 +43,23 @@ post_install() { # addgroup kismet if needed - if ! grep -q kismet $1/etc/group; then + if ! grep -q kismet "$1/etc/group"; then echo -n "Adding group kismet..." - chroot $1/ addgroup -g 315 kismet + chroot "$1/" addgroup -g 315 kismet status fi # Add tux to kismet group - chroot $1/ addgroup tux kismet + chroot "$1/" addgroup tux kismet # set Kismet as suid-root echo -n "Set Kismet as suid-root.." - chroot $1/ chown root:kismet /usr/bin/kismet_capture && \ - chroot $1/ chmod 4550 /usr/bin/kismet_capture + chroot "$1/" chown root:kismet /usr/bin/kismet_capture && \ + chroot "$1/" chmod 4550 /usr/bin/kismet_capture status # configuration files update create=1 overwrite=2 keep=3 - cd $1/etc/kismet + cd "$1/etc/kismet" # kismet_ui.conf doesn't exists anymore if [ -e kismet_ui.conf ]; then mv kismet_ui.conf kismet_ui.oldpkg diff -r 67528625d306 -r 9e01bc6321ea kriss_feed/receipt --- a/kriss_feed/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/kriss_feed/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ post_install() { - chown -R www $1/var/www/$PACKAGE + chown -R www "$1/var/www/$PACKAGE" } diff -r 67528625d306 -r 9e01bc6321ea less/receipt --- a/less/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/less/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -38,15 +38,13 @@ # pre_install() { - local root - root=$1 echo "Processing pre-install commands..." echo -n "Removing all Busybox replaced utils... " - rm -f $root/usr/bin/less + rm -f "$1/usr/bin/less" status } post_remove() { - ln -s /bin/busybox $1/usr/bin/less + ln -s /bin/busybox "$1/usr/bin/less" } diff -r 67528625d306 -r 9e01bc6321ea libQtGui/receipt --- a/libQtGui/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/libQtGui/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -29,9 +29,9 @@ post_install() { - for i in $(ls $1/home 2> /dev/null); do - [ -f /home/$i/.config/Trolltech.conf ] && continue - cp $1/etc/skel/.config/Trolltech.conf $1/home/$i/.config - chroot $1/ chown -R $(stat -c "%u.%g" $1/home/$i) /home/$i/.config + for i in $(ls "$1/home" 2> /dev/null); do + [ -f "/home/$i/.config/Trolltech.conf" ] && continue + cp "$1/etc/skel/.config/Trolltech.conf" "$1/home/$i/.config" + chroot "$1/" chown -R $(stat -c "%u.%g" "$1/home/$i") "/home/$i/.config" done } diff -r 67528625d306 -r 9e01bc6321ea libdevmapper/receipt --- a/libdevmapper/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/libdevmapper/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -22,5 +22,5 @@ post_install() { - tazpkg reconfigure udev --root=$1 + tazpkg reconfigure udev --root="$1" } diff -r 67528625d306 -r 9e01bc6321ea libgphoto2/receipt --- a/libgphoto2/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/libgphoto2/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -54,16 +54,14 @@ post_install() { - local root=$1 - - HAL_FDI="$root/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi" - UDEV_RULE="$root/etc/udev/rules.d/70-libgphoto2.rules" - CAM_LIST="$root/usr/lib/libgphoto2/print-camera-list" + HAL_FDI="$1/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi" + UDEV_RULE="$1/etc/udev/rules.d/70-libgphoto2.rules" + CAM_LIST="$1/usr/lib/libgphoto2/print-camera-list" # Let print-camera-list find libgphoto2.so - export LD_LIBRARY_PATH="$root/usr/lib" + export LD_LIBRARY_PATH="$1/usr/lib" # Let libgphoto2 find its camera-modules before running print-camera-list - export CAMLIBS="$root/usr/lib/libgphoto2/$VERSION" + export CAMLIBS="$1/usr/lib/libgphoto2/$VERSION" # HAL file "$CAM_LIST" hal-fdi > "$HAL_FDI" || return 1 @@ -71,10 +69,10 @@ #udev rule "$CAM_LIST" udev-rules version 0.98 group camera mode 0660 > "$UDEV_RULE" || return 1 - tazpkg reconfigure udev --root=$root + tazpkg reconfigure udev --root="$1" # add group camera - if ! grep -q camera $root/etc/group; then + if ! grep -q camera "$1/etc/group"; then chroot "$1/" addgroup -g 97 camera fi diff -r 67528625d306 -r 9e01bc6321ea librsvg/receipt --- a/librsvg/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/librsvg/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -50,6 +50,6 @@ post_install() { echo -n "Updating gdk pixbuf loaders cache file..." - chroot $1/ /usr/bin/gdk-pixbuf-query-loaders --update-cache + chroot "$1/" /usr/bin/gdk-pixbuf-query-loaders --update-cache status } diff -r 67528625d306 -r 9e01bc6321ea lightdm-gtk2-greeter/receipt --- a/lightdm-gtk2-greeter/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/lightdm-gtk2-greeter/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -48,12 +48,12 @@ { echo 'make lightdm-gtk2-greeter default greeter' sed -i 's|^# \(greeter-session =\)|\1 lightdm-gtk2-greeter #|' \ - $1/etc/lightdm/lightdm.conf + "$1/etc/lightdm/lightdm.conf" } post_remove() { echo 'back to default greeter' sed -i 's|^\(greeter-session =\).*#\(.*\)|#\1\2|' \ - $1/etc/lightdm/lightdm.conf + "$1/etc/lightdm/lightdm.conf" } diff -r 67528625d306 -r 9e01bc6321ea lightdm-gtk3-greeter/receipt --- a/lightdm-gtk3-greeter/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/lightdm-gtk3-greeter/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -47,12 +47,12 @@ { echo 'make lightdm-gtk3-greeter default greeter' sed -i 's|^# \(greeter-session =\)|\1 lightdm-gtk3-greeter #|' \ - $1/etc/lightdm/lightdm.conf + "$1/etc/lightdm/lightdm.conf" } post_remove() { echo 'back to default greeter' sed -i 's|^\(greeter-session =\).*#\(.*\)|#\1\2|' \ - $1/etc/lightdm/lightdm.conf + "$1/etc/lightdm/lightdm.conf" } diff -r 67528625d306 -r 9e01bc6321ea lighttpd-ssl/receipt --- a/lighttpd-ssl/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/lighttpd-ssl/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -102,22 +102,22 @@ post_install() { echo "Processing post-install commands..." - if [ ! -f $1/etc/ssl/lighttpd/lighttpd.pem ]; then + if [ ! -f "$1/etc/ssl/lighttpd/lighttpd.pem" ]; then openssl req -new -x509 \ - -keyout $1/etc/ssl/lighttpd/lighttpd.pem \ - -out $1/etc/ssl/lighttpd/lighttpd.pem \ + -keyout "$1/etc/ssl/lighttpd/lighttpd.pem" \ + -out "$1/etc/ssl/lighttpd/lighttpd.pem" \ -days 3650 -nodes < /dev/null | grep -q :80 || /etc/init.d/$PACKAGE start } diff -r 67528625d306 -r 9e01bc6321ea linux-autofs/receipt --- a/linux-autofs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-autofs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -29,14 +29,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } - diff -r 67528625d306 -r 9e01bc6321ea linux-cifs/receipt --- a/linux-cifs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-cifs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -29,14 +29,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } - diff -r 67528625d306 -r 9e01bc6321ea linux-coda/receipt --- a/linux-coda/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-coda/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -29,14 +29,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } - diff -r 67528625d306 -r 9e01bc6321ea linux-configfs/receipt --- a/linux-configfs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-configfs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -29,14 +29,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } - diff -r 67528625d306 -r 9e01bc6321ea linux-cramfs/receipt --- a/linux-cramfs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-cramfs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -29,14 +29,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } - diff -r 67528625d306 -r 9e01bc6321ea linux-dlm/receipt --- a/linux-dlm/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-dlm/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -31,14 +31,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } - diff -r 67528625d306 -r 9e01bc6321ea linux-exofs/receipt --- a/linux-exofs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-exofs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -29,14 +29,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } - diff -r 67528625d306 -r 9e01bc6321ea linux-gfs2/receipt --- a/linux-gfs2/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-gfs2/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -29,14 +29,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } - diff -r 67528625d306 -r 9e01bc6321ea linux-hfs/receipt --- a/linux-hfs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-hfs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -29,14 +29,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } - diff -r 67528625d306 -r 9e01bc6321ea linux-hfsplus/receipt --- a/linux-hfsplus/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-hfsplus/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -29,13 +29,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } diff -r 67528625d306 -r 9e01bc6321ea linux-jfs/receipt --- a/linux-jfs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-jfs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -29,13 +29,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } diff -r 67528625d306 -r 9e01bc6321ea linux-libre-api-headers/receipt --- a/linux-libre-api-headers/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-libre-api-headers/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -43,6 +43,6 @@ post_install() { # Removed old linux-libre-headers - [ ! -d $1/var/lib/tazpkg/installed/linux-libre-headers ] || - rm -rf $1/var/lib/tazpkg/installed/linux-libre-headers + [ ! -d "$1/var/lib/tazpkg/installed/linux-libre-headers" ] || + rm -rf "$1/var/lib/tazpkg/installed/linux-libre-headers" } diff -r 67528625d306 -r 9e01bc6321ea linux-libre-autofs/receipt --- a/linux-libre-autofs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-libre-autofs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -31,14 +31,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE##*-}$ $1/etc/filesystems || \ - echo "${PACKAGE##*-}" >> $1/etc/filesystems + grep -qs ^${PACKAGE##*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE##*-}" >> "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE##*-}\$/d" $1/etc/filesystems + sed -i "/^${PACKAGE##*-}\$/d" "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } - diff -r 67528625d306 -r 9e01bc6321ea linux-libre-btrfs/receipt --- a/linux-libre-btrfs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-libre-btrfs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -37,14 +37,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE##*-}$ $1/etc/filesystems || \ - echo "${PACKAGE##*-}" >> $1/etc/filesystems + grep -qs ^${PACKAGE##*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE##*-}" >> "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE##*-}\$/d" $1/etc/filesystems + sed -i "/^${PACKAGE##*-}\$/d" "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } - diff -r 67528625d306 -r 9e01bc6321ea linux-libre-cifs/receipt --- a/linux-libre-cifs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-libre-cifs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -31,14 +31,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE##*-}$ $1/etc/filesystems || \ - echo "${PACKAGE##*-}" >> $1/etc/filesystems + grep -qs ^${PACKAGE##*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE##*-}" >> "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE##*-}\$/d" $1/etc/filesystems + sed -i "/^${PACKAGE##*-}\$/d" "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } - diff -r 67528625d306 -r 9e01bc6321ea linux-libre-coda/receipt --- a/linux-libre-coda/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-libre-coda/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -31,14 +31,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE##*-}$ $1/etc/filesystems || \ - echo "${PACKAGE##*-}" >> $1/etc/filesystems + grep -qs ^${PACKAGE##*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE##*-}" >> "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE##*-}\$/d" $1/etc/filesystems + sed -i "/^${PACKAGE##*-}\$/d" "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } - diff -r 67528625d306 -r 9e01bc6321ea linux-libre-configfs/receipt --- a/linux-libre-configfs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-libre-configfs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -31,14 +31,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE##*-}$ $1/etc/filesystems || \ - echo "${PACKAGE##*-}" >> $1/etc/filesystems + grep -qs ^${PACKAGE##*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE##*-}" >> "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE##*-}\$/d" $1/etc/filesystems + sed -i "/^${PACKAGE##*-}\$/d" "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } - diff -r 67528625d306 -r 9e01bc6321ea linux-libre-cramfs/receipt --- a/linux-libre-cramfs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-libre-cramfs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -31,14 +31,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE##*-}$ $1/etc/filesystems || \ - echo "${PACKAGE##*-}" >> $1/etc/filesystems + grep -qs ^${PACKAGE##*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE##*-}" >> "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE##*-}\$/d" $1/etc/filesystems + sed -i "/^${PACKAGE##*-}\$/d" "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } - diff -r 67528625d306 -r 9e01bc6321ea linux-libre-dlm/receipt --- a/linux-libre-dlm/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-libre-dlm/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -32,14 +32,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE##*-}$ $1/etc/filesystems || \ - echo "${PACKAGE##*-}" >> $1/etc/filesystems + grep -qs ^${PACKAGE##*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE##*-}" >> "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE##*-}\$/d" $1/etc/filesystems + sed -i "/^${PACKAGE##*-}\$/d" "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } - diff -r 67528625d306 -r 9e01bc6321ea linux-libre-gfs2/receipt --- a/linux-libre-gfs2/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-libre-gfs2/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -31,14 +31,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE##*-}$ $1/etc/filesystems || \ - echo "${PACKAGE##*-}" >> $1/etc/filesystems + grep -qs ^${PACKAGE##*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE##*-}" >> "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE##*-}\$/d" $1/etc/filesystems + sed -i "/^${PACKAGE##*-}\$/d" "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } - diff -r 67528625d306 -r 9e01bc6321ea linux-libre-hfs/receipt --- a/linux-libre-hfs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-libre-hfs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -31,14 +31,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE##*-}$ $1/etc/filesystems || \ - echo "${PACKAGE##*-}" >> $1/etc/filesystems + grep -qs ^${PACKAGE##*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE##*-}" >> "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE##*-}\$/d" $1/etc/filesystems + sed -i "/^${PACKAGE##*-}\$/d" "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } - diff -r 67528625d306 -r 9e01bc6321ea linux-libre-hfsplus/receipt --- a/linux-libre-hfsplus/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-libre-hfsplus/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -31,13 +31,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE##*-}$ $1/etc/filesystems || \ - echo "${PACKAGE##*-}" >> $1/etc/filesystems + grep -qs ^${PACKAGE##*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE##*-}" >> "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE##*-}\$/d" $1/etc/filesystems + sed -i "/^${PACKAGE##*-}\$/d" "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } diff -r 67528625d306 -r 9e01bc6321ea linux-libre-jfs/receipt --- a/linux-libre-jfs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-libre-jfs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -31,13 +31,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE##*-}$ $1/etc/filesystems || \ - echo "${PACKAGE##*-}" >> $1/etc/filesystems + grep -qs ^${PACKAGE##*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE##*-}" >> "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE##*-}\$/d" $1/etc/filesystems + sed -i "/^${PACKAGE##*-}\$/d" "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } diff -r 67528625d306 -r 9e01bc6321ea linux-libre-logfs/receipt --- a/linux-libre-logfs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-libre-logfs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -31,14 +31,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE##*-}$ $1/etc/filesystems || \ - echo "${PACKAGE##*-}" >> $1/etc/filesystems + grep -qs ^${PACKAGE##*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE##*-}" >> "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE##*-}\$/d" $1/etc/filesystems + sed -i "/^${PACKAGE##*-}\$/d" "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } - diff -r 67528625d306 -r 9e01bc6321ea linux-libre-minix/receipt --- a/linux-libre-minix/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-libre-minix/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -31,14 +31,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE##*-}$ $1/etc/filesystems || \ - echo "${PACKAGE##*-}" >> $1/etc/filesystems + grep -qs ^${PACKAGE##*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE##*-}" >> "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE##*-}\$/d" $1/etc/filesystems + sed -i "/^${PACKAGE##*-}\$/d" "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } - diff -r 67528625d306 -r 9e01bc6321ea linux-libre-module-headers/receipt --- a/linux-libre-module-headers/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-libre-module-headers/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -137,13 +137,13 @@ } pre_remove() { - if [ -e $1/usr/src/linux ]; then - rm -rf $1/usr/src/linux + if [ -e "$1/usr/src/linux" ]; then + rm -rf "$1/usr/src/linux" fi } post_install() { # Added soft link to make it easier to point to kernel folder - [ -L $1/usr/src/linux ] && rm -f $1/usr/src/linux - ln -sf /usr/src/linux-$KVERSION $1/usr/src/linux + [ -L "$1/usr/src/linux" ] && rm -f "$1/usr/src/linux" + ln -sf /usr/src/linux-$KVERSION "$1/usr/src/linux" } diff -r 67528625d306 -r 9e01bc6321ea linux-libre-ncpfs/receipt --- a/linux-libre-ncpfs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-libre-ncpfs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -31,14 +31,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE##*-}$ $1/etc/filesystems || \ - echo "${PACKAGE##*-}" >> $1/etc/filesystems + grep -qs ^${PACKAGE##*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE##*-}" >> "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE##*-}\$/d" $1/etc/filesystems + sed -i "/^${PACKAGE##*-}\$/d" "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } - diff -r 67528625d306 -r 9e01bc6321ea linux-libre-nfsd/receipt --- a/linux-libre-nfsd/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-libre-nfsd/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -31,14 +31,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE##*-}$ $1/etc/filesystems || \ - echo "${PACKAGE##*-}" >> $1/etc/filesystems + grep -qs ^${PACKAGE##*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE##*-}" >> "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE##*-}\$/d" $1/etc/filesystems + sed -i "/^${PACKAGE##*-}\$/d" "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } - diff -r 67528625d306 -r 9e01bc6321ea linux-libre-reiserfs/receipt --- a/linux-libre-reiserfs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-libre-reiserfs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -31,14 +31,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE##*-}$ $1/etc/filesystems || \ - echo "${PACKAGE##*-}" >> $1/etc/filesystems + grep -qs ^${PACKAGE##*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE##*-}" >> "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE##*-}\$/d" $1/etc/filesystems + sed -i "/^${PACKAGE##*-}\$/d" "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } - diff -r 67528625d306 -r 9e01bc6321ea linux-libre-squashfs/receipt --- a/linux-libre-squashfs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-libre-squashfs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -32,14 +32,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE##*-}$ $1/etc/filesystems || \ - echo "${PACKAGE##*-}" >> $1/etc/filesystems + grep -qs ^${PACKAGE##*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE##*-}" >> "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE##*-}\$/d" $1/etc/filesystems + sed -i "/^${PACKAGE##*-}\$/d" "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } - diff -r 67528625d306 -r 9e01bc6321ea linux-libre-udf/receipt --- a/linux-libre-udf/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-libre-udf/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -37,14 +37,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE##*-}$ $1/etc/filesystems || \ - echo "${PACKAGE##*-}" >> $1/etc/filesystems + grep -qs ^${PACKAGE##*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE##*-}" >> "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE##*-}\$/d" $1/etc/filesystems + sed -i "/^${PACKAGE##*-}\$/d" "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } - diff -r 67528625d306 -r 9e01bc6321ea linux-libre-usbip/receipt --- a/linux-libre-usbip/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-libre-usbip/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -30,14 +30,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE##*-}$ $1/etc/filesystems || \ - echo "${PACKAGE##*-}" >> $1/etc/filesystems + grep -qs ^${PACKAGE##*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE##*-}" >> "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE##*-}\$/d" $1/etc/filesystems + sed -i "/^${PACKAGE##*-}\$/d" "$1/etc/filesystems" chroot "$1/" depmod -a $VERSION-slitaz } - diff -r 67528625d306 -r 9e01bc6321ea linux-libre/receipt --- a/linux-libre/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-libre/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -173,11 +173,11 @@ chroot "$1/" depmod -a $VERSION-slitaz # GRUB stuff. if [ -f "$1/boot/grub/menu.lst" ]; then - root_dev=`cat $1/boot/grub/menu.lst | grep root= | sed 's/.*root=\([^ ]*\).*/\1/' | head -n 1` - grub_dev=`cat $1/boot/grub/menu.lst | grep "root (" | head -n 1` + root_dev=`cat "$1/boot/grub/menu.lst" | grep root= | sed 's/.*root=\([^ ]*\).*/\1/' | head -n 1` + grub_dev=`cat "$1/boot/grub/menu.lst" | grep "root (" | head -n 1` # Add new kernel entry in case of upgrade for installed system. - if ! grep -q $PACKAGE-$VERSION-slitaz $1/boot/grub/menu.lst; then - cat >> $1/boot/grub/menu.lst << EOT + if ! grep -q $PACKAGE-$VERSION-slitaz "$1/boot/grub/menu.lst"; then + cat >> "$1/boot/grub/menu.lst" << EOT title SliTaz GNU/Linux (Kernel $VERSION-slitaz) $grub_dev diff -r 67528625d306 -r 9e01bc6321ea linux-logfs/receipt --- a/linux-logfs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-logfs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -29,14 +29,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } - diff -r 67528625d306 -r 9e01bc6321ea linux-minix/receipt --- a/linux-minix/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-minix/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -29,14 +29,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } - diff -r 67528625d306 -r 9e01bc6321ea linux-module-headers/receipt --- a/linux-module-headers/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-module-headers/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -20,13 +20,13 @@ } pre_remove() { - if [ -e $1/usr/src/linux ]; then - rm -rf $1/usr/src/linux + if [ -e "$1/usr/src/linux" ]; then + rm -rf "$1/usr/src/linux" fi } post_install() { # Added soft link to make it easier to point to kernel folder - [ -L $1/usr/src/linux ] && rm -f $1/usr/src/linux - ln -sf /usr/src/linux-$KVERSION $1/usr/src/linux + [ -L "$1/usr/src/linux" ] && rm -f "$1/usr/src/linux" + ln -sf /usr/src/linux-$KVERSION "$1/usr/src/linux" } diff -r 67528625d306 -r 9e01bc6321ea linux-ncpfs/receipt --- a/linux-ncpfs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-ncpfs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -29,14 +29,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } - diff -r 67528625d306 -r 9e01bc6321ea linux-nfsd/receipt --- a/linux-nfsd/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-nfsd/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -29,14 +29,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } - diff -r 67528625d306 -r 9e01bc6321ea linux-reiserfs/receipt --- a/linux-reiserfs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-reiserfs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -29,14 +29,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } - diff -r 67528625d306 -r 9e01bc6321ea linux-romfs/receipt --- a/linux-romfs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-romfs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -29,14 +29,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } - diff -r 67528625d306 -r 9e01bc6321ea linux-squashfs/receipt --- a/linux-squashfs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-squashfs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -30,14 +30,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } - diff -r 67528625d306 -r 9e01bc6321ea linux-usbip/receipt --- a/linux-usbip/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux-usbip/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -28,14 +28,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz } - diff -r 67528625d306 -r 9e01bc6321ea linux/receipt --- a/linux/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -412,25 +412,25 @@ grub_part="$(( $(echo $root_dev | grep -o '[0-9]*$')-1 ))" # Use device.map to find grub device number grub_dev="$(grep $(echo $root_dev | grep -o '^/dev/.d.' ) \ - $1/boot/grub/device.map | cut -f1 | sed "s/)$/.$grub_part)/g")" + "$1/boot/grub/device.map" | cut -f1 | sed "s/)$/.$grub_part)/g")" # Add and clean kernel entries in case of upgrade for installed system. - if ! grep -q vmlinuz-$VERSION-slitaz $1/boot/grub/menu.lst; then + if ! grep -q vmlinuz-$VERSION-slitaz "$1/boot/grub/menu.lst"; then # Clean the old entry # TODO: old vmlinuz file is removed but the entry is still there. # So grub error:15 when selected: http://bugs.slitaz.org/?id=74 # Add the new entry - cat >> $1/boot/grub/menu.lst << EOT + cat >> "$1/boot/grub/menu.lst" << EOT title SliTaz GNU/Linux (Kernel $VERSION-slitaz) $grub_dev kernel /boot/vmlinuz-$VERSION-slitaz root=$root_dev quiet EOT # Make it the default entry - last_entry=$(( $(grep -c '^title' $1/boot/grub/menu.lst)-1 )) - sed -e "s/^default.*/default $last_entry/g" -i $1/boot/grub/menu.lst + last_entry=$(( $(grep -c '^title' "$1/boot/grub/menu.lst")-1 )) + sed -e "s/^default.*/default $last_entry/g" -i "$1/boot/grub/menu.lst" fi # Display information message. diff -r 67528625d306 -r 9e01bc6321ea linux64-autofs/receipt --- a/linux64-autofs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux64-autofs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -33,14 +33,14 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } diff -r 67528625d306 -r 9e01bc6321ea linux64-btrfs/receipt --- a/linux64-btrfs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux64-btrfs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -39,14 +39,14 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } diff -r 67528625d306 -r 9e01bc6321ea linux64-cifs/receipt --- a/linux64-cifs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux64-cifs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -33,14 +33,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } - diff -r 67528625d306 -r 9e01bc6321ea linux64-coda/receipt --- a/linux64-coda/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux64-coda/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -33,14 +33,14 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } diff -r 67528625d306 -r 9e01bc6321ea linux64-configfs/receipt --- a/linux64-configfs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux64-configfs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -33,14 +33,14 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } diff -r 67528625d306 -r 9e01bc6321ea linux64-cramfs/receipt --- a/linux64-cramfs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux64-cramfs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -33,14 +33,14 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } diff -r 67528625d306 -r 9e01bc6321ea linux64-dlm/receipt --- a/linux64-dlm/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux64-dlm/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -34,14 +34,14 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } diff -r 67528625d306 -r 9e01bc6321ea linux64-exofs/receipt --- a/linux64-exofs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux64-exofs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -33,14 +33,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } - diff -r 67528625d306 -r 9e01bc6321ea linux64-gfs2/receipt --- a/linux64-gfs2/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux64-gfs2/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -33,14 +33,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } - diff -r 67528625d306 -r 9e01bc6321ea linux64-hfs/receipt --- a/linux64-hfs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux64-hfs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -33,14 +33,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } - diff -r 67528625d306 -r 9e01bc6321ea linux64-hfsplus/receipt --- a/linux64-hfsplus/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux64-hfsplus/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -33,13 +33,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } diff -r 67528625d306 -r 9e01bc6321ea linux64-jfs/receipt --- a/linux64-jfs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux64-jfs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -33,13 +33,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } diff -r 67528625d306 -r 9e01bc6321ea linux64-logfs/receipt --- a/linux64-logfs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux64-logfs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -33,14 +33,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } - diff -r 67528625d306 -r 9e01bc6321ea linux64-minix/receipt --- a/linux64-minix/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux64-minix/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -33,14 +33,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } - diff -r 67528625d306 -r 9e01bc6321ea linux64-module-headers/receipt --- a/linux64-module-headers/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux64-module-headers/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -20,13 +20,13 @@ } pre_remove() { - if [ -e $1/usr/src/linux ]; then - rm -rf $1/usr/src/linux + if [ -e "$1/usr/src/linux" ]; then + rm -rf "$1/usr/src/linux" fi } post_install() { # Added soft link to make it easier to point to kernel folder - [ -L $1/usr/src/linux ] && rm -f $1/usr/src/linux - ln -sf /usr/src/linux-$KVERSION $1/usr/src/linux + [ -L "$1/usr/src/linux" ] && rm -f "$1/usr/src/linux" + ln -sf /usr/src/linux-$KVERSION "$1/usr/src/linux" } diff -r 67528625d306 -r 9e01bc6321ea linux64-ncpfs/receipt --- a/linux64-ncpfs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux64-ncpfs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -33,14 +33,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } - diff -r 67528625d306 -r 9e01bc6321ea linux64-nfsd/receipt --- a/linux64-nfsd/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux64-nfsd/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -33,14 +33,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } - diff -r 67528625d306 -r 9e01bc6321ea linux64-reiserfs/receipt --- a/linux64-reiserfs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux64-reiserfs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -33,14 +33,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } - diff -r 67528625d306 -r 9e01bc6321ea linux64-romfs/receipt --- a/linux64-romfs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux64-romfs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -33,14 +33,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } - diff -r 67528625d306 -r 9e01bc6321ea linux64-squashfs/receipt --- a/linux64-squashfs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux64-squashfs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -33,14 +33,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } - diff -r 67528625d306 -r 9e01bc6321ea linux64-usbip/receipt --- a/linux64-usbip/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux64-usbip/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -31,14 +31,13 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ - echo "${PACKAGE#*-}" >> $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + grep -qs ^${PACKAGE#*-}$ "$1/etc/filesystems" || \ + echo "${PACKAGE#*-}" >> "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } post_remove() { - sed -i "/^${PACKAGE#*-}\$/d" $1/etc/filesystems - chroot "$root/" depmod -a $VERSION-slitaz64 + sed -i "/^${PACKAGE#*-}\$/d" "$1/etc/filesystems" + chroot "$1/" depmod -a $VERSION-slitaz64 } - diff -r 67528625d306 -r 9e01bc6321ea linux64/receipt --- a/linux64/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/linux64/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -65,8 +65,8 @@ root_dev=$(cat $root/boot/grub/menu.lst | grep root= | sed 's/.*root=\([^ ]*\).*/\1/' | head -n 1) grub_dev=$(cat $root/boot/grub/menu.lst | grep "root (" | head -n 1) # Add new kernel entry in case of upgrade for installed system. - if ! grep -q $PACKAGE-$VERSION-slitaz64 $1/boot/grub/menu.lst; then - cat >> $1/boot/grub/menu.lst << EOT + if ! grep -q $PACKAGE-$VERSION-slitaz64 "$1/boot/grub/menu.lst"; then + cat >> "$1/boot/grub/menu.lst" << EOT title SliTaz GNU/Linux (Kernel $VERSION-slitaz64) $grub_dev diff -r 67528625d306 -r 9e01bc6321ea logrotate/receipt --- a/logrotate/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/logrotate/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -32,19 +32,19 @@ post_install() { - if [ -f $1/var/spool/cron/crontabs/root ]; then + if [ -f "$1/var/spool/cron/crontabs/root" ]; then echo "Runing post install command..." echo -e "#Run log rotation\n25 6 * * * /usr/sbin/logrotate /etc/logrotate.conf " \ - >> $1/var/spool/cron/crontabs/root + >> "$1/var/spool/cron/crontabs/root" fi } post_remove() { - if [ -f $1/var/spool/cron/crontabs/root ]; then + if [ -f "$1/var/spool/cron/crontabs/root" ]; then echo "Runing post install command..." - sed -i s!.*logrotate.*!! $1/var/spool/cron/crontabs/root + sed -i s!.*logrotate.*!! "$1/var/spool/cron/crontabs/root" fi } diff -r 67528625d306 -r 9e01bc6321ea lxde/receipt --- a/lxde/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/lxde/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -29,12 +29,10 @@ # Add WM to SLIM available sessions. post_install() { - local root - root=$1 - res=$(cat $root/etc/slim.conf | grep ^session | sed s/"sessions. *"//) + res=$(cat "$1/etc/slim.conf" | grep ^session | sed s/"sessions. *"//) if ! echo "$res" | grep -q $PACKAGE; then echo -n "Adding $PACKAGE to /etc/slim.conf..." - sed -i "s/^sessions.*/sessions ${res},$PACKAGE/" $root/etc/slim.conf + sed -i "s/^sessions.*/sessions ${res},$PACKAGE/" "$1/etc/slim.conf" status fi } @@ -42,9 +40,7 @@ # Remove WM from SLIM available sessions. post_remove() { - local root - root=$1 if grep -q $PACKAGE $root/etc/slim.conf; then - sed -i s/,$PACKAGE// $root/etc/slim.conf + sed -i s/,$PACKAGE// "$1/etc/slim.conf" fi } diff -r 67528625d306 -r 9e01bc6321ea lxqt-common/receipt --- a/lxqt-common/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/lxqt-common/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -39,11 +39,11 @@ post_install() { - res=$(cat $1/etc/slim.conf | grep ^session | sed s/"sessions. *"//) + res=$(cat "$1/etc/slim.conf" | grep ^session | sed s/"sessions. *"//) # Adding WM to SLIM available sessions. if ! echo "$res" | grep -q $PACKAGE; then echo -n "Adding lxqt to /etc/slim.conf..." - sed -i "s/^sessions.*/sessions ${res},lxqt/" $1/etc/slim.conf + sed -i "s/^sessions.*/sessions ${res},lxqt/" "$1/etc/slim.conf" status fi } @@ -51,8 +51,8 @@ post_remove() { # Remove WM from SLIM available sessions. - if grep -q lxqt $1/etc/slim.conf; then - sed -i s/,lxqt// $1/etc/slim.conf + if grep -q lxqt "$1/etc/slim.conf"; then + sed -i s/,lxqt// "$1/etc/slim.conf" fi } diff -r 67528625d306 -r 9e01bc6321ea lxqt/receipt --- a/lxqt/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/lxqt/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -25,25 +25,25 @@ post_install() { - for i in $(ls -d $1/home/* 2> /dev/null); - do [ -d $i ] && \ - sed '/WINDOW_MANAGER=/s|"\([^"]*\)"|"startlxqt"|' -i \ - $i/.config/slitaz/applications.conf \ - $1/etc/slitaz/applications.conf + for i in $(ls -d "$1"/home/* 2> /dev/null); + do [ -d "$i" ] && \ + sed '/WINDOW_MANAGER=/s|"\([^"]*\)"|"startlxqt"|' -i \ + "$i/.config/slitaz/applications.conf" \ + "$1/etc/slitaz/applications.conf" done for a in lxpanel pcmanfm tazpkg-notify xcompmgr; do - grep -q LXQt $1/etc/xdg/autostart/$a.desktop || \ - sed '/NotShowIn=/s|;$|&LXQt;|' -i $1/etc/xdg/autostart/$a.desktop + grep -q LXQt "$1/etc/xdg/autostart/$a.desktop" || \ + sed '/NotShowIn=/s|;$|&LXQt;|' -i "$1/etc/xdg/autostart/$a.desktop" done } post_remove() { - for i in $(ls -d $1/home/* 2> /dev/null); - do [ -d $i ] && \ - sed '/WINDOW_MANAGER=/s|"\([^"]*\)"|"lxde-session"|' -i \ - $i/.config/slitaz/applications.conf \ - $1/etc/slitaz/applications.conf + for i in $(ls -d "$1"/home/* 2> /dev/null); + do [ -d "$i" ] && \ + sed '/WINDOW_MANAGER=/s|"\([^"]*\)"|"lxde-session"|' -i \ + "$i/.config/slitaz/applications.conf" \ + "$1/etc/slitaz/applications.conf" done } diff -r 67528625d306 -r 9e01bc6321ea lzma/receipt --- a/lzma/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/lzma/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -55,17 +55,15 @@ # pre_install() { - local root - root=$1 echo "Processing pre-install commands..." echo -n "Removing all Busybox replaced utils... " - rm -f $root/usr/bin/unlzma - rm -f $root/usr/bin/lzcat + rm -f "$1/usr/bin/unlzma" + rm -f "$1/usr/bin/lzcat" status } post_remove() { - ln -s /bin/busybox $1/usr/bin/unlzma - ln -s /bin/busybox $1/usr/bin/lzcat + ln -s /bin/busybox "$1/usr/bin/unlzma" + ln -s /bin/busybox "$1/usr/bin/lzcat" } diff -r 67528625d306 -r 9e01bc6321ea marco/receipt --- a/marco/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/marco/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -44,11 +44,11 @@ post_install() { echo "Processing post-install commands..." - chroot $1/ /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas + chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas } post_remove() { echo "Processing post-remove commands..." - chroot $1/ /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas + chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas } diff -r 67528625d306 -r 9e01bc6321ea mariadb/receipt --- a/mariadb/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/mariadb/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -83,10 +83,10 @@ user=mysql group=mysql - if ! grep -q $user $1/etc/passwd; then + if ! grep -q $user "$1/etc/passwd"; then echo -n "Adding user/group $user..." - chroot $1/ addgroup -S $group - chroot $1/ adduser -s /bin/false -S -D -H -G $group $user + chroot "$1/" addgroup -S $group + chroot "$1/" adduser -s /bin/false -S -D -H -G $group $user status fi @@ -104,9 +104,9 @@ pre_install() { # Cleanup old files - rm -f $1/usr/libexec/mysql* + rm -f "$1/usr/libexec/mysql"* # Mv config - [ -f $1/etc/my.cnf ] && mv -f $1/etc/my.cnf $1/etc/mysql/my.cnf + [ -f "$1/etc/my.cnf" ] && mv -f "$1/etc/my.cnf" "$1/etc/mysql/my.cnf" } post_remove() diff -r 67528625d306 -r 9e01bc6321ea mate-control-center/receipt --- a/mate-control-center/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/mate-control-center/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -47,16 +47,16 @@ post_install() { echo "Processing post-install commands..." - [ -x $1/usr/bin/gtk-update-icon-cache ] && + [ -x "$1/usr/bin/gtk-update-icon-cache" ] && chroot "$1/" gtk-update-icon-cache -f -t /usr/share/icons/hicolor - chroot $1/ /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas - chroot $1/ /usr/bin/update-mime-database /usr/share/mime + chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas + chroot "$1/" /usr/bin/update-mime-database /usr/share/mime } post_remove() { echo "Processing post-remove commands..." - chroot $1/ /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas - chroot $1/ /usr/bin/gtk-update-icon-cache -f -t /usr/share/icons/hicolor - chroot $1/ /usr/bin/update-mime-database /usr/share/mime + chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas + chroot "$1/" /usr/bin/gtk-update-icon-cache -f -t /usr/share/icons/hicolor + chroot "$1/" /usr/bin/update-mime-database /usr/share/mime } diff -r 67528625d306 -r 9e01bc6321ea mate-panel/receipt --- a/mate-panel/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/mate-panel/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -49,11 +49,11 @@ post_install() { echo "Processing post-install commands..." - chroot $1/ /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas + chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas } post_remove() { echo "Processing post-remove commands..." - chroot $1/ /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas + chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas } diff -r 67528625d306 -r 9e01bc6321ea mate-session-manager/receipt --- a/mate-session-manager/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/mate-session-manager/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -44,11 +44,11 @@ post_install() { echo "Processing post-install commands..." - chroot $1/ /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas + chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas } post_remove() { echo "Processing post-remove commands..." - chroot $1/ /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas + chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas } diff -r 67528625d306 -r 9e01bc6321ea mgetty/receipt --- a/mgetty/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/mgetty/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -51,15 +51,15 @@ post_install() { # adduser fax if needed - if ! grep -q fax $1/etc/passwd; then + if ! grep -q fax "$1/etc/passwd"; then echo -n "Adding user fax..." - chroot $1/ adduser fax -D -H -S + chroot "$1/" adduser fax -D -H -S status fi - chroot $1/ chown fax /var/spool/fax + chroot "$1/" chown fax /var/spool/fax } post_remove() { - chroot $1/ deluser fax + chroot "$1/" deluser fax } diff -r 67528625d306 -r 9e01bc6321ea mingw32-gcc-c/receipt --- a/mingw32-gcc-c/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/mingw32-gcc-c/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -66,9 +66,7 @@ post_install() { # Archives get stripped during packaging; need to run ranlib - local root - root=$1 - find $root/usr/lib/gcc/$MINGW32_ID/ -name *.a -exec $MINGW32_ID-ranlib {} \; + find "$1/usr/lib/gcc/$MINGW32_ID/" -name *.a -exec $MINGW32_ID-ranlib {} \; } # Rules to clean the package diff -r 67528625d306 -r 9e01bc6321ea mingw32-gcc/receipt --- a/mingw32-gcc/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/mingw32-gcc/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -84,10 +84,8 @@ post_install() { # Archives get stripped during packaging; need to run ranlib - local root - root=$1 - find $root/usr/lib/gcc/$MINGW32_ID/ -name *.a -exec $MINGW32_ID-ranlib {} \; - find $root/usr/$MINGW32_ID/lib/ -name *.a -exec $MINGW32_ID-ranlib {} \; + find "$1/usr/lib/gcc/$MINGW32_ID/" -name *.a -exec $MINGW32_ID-ranlib {} \; + find "$1/usr/$MINGW32_ID/lib/" -name *.a -exec $MINGW32_ID-ranlib {} \; } # Rules to clean the package diff -r 67528625d306 -r 9e01bc6321ea mingw32-runtime/receipt --- a/mingw32-runtime/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/mingw32-runtime/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -54,9 +54,7 @@ post_install() { # Archives get stripped during packaging; need to run ranlib - local root - root=$1 - find $root/usr/$MINGW32_ID/lib/ -name *.a -exec $MINGW32_ID-ranlib {} \; + find "$1/usr/$MINGW32_ID/lib/" -name *.a -exec $MINGW32_ID-ranlib {} \; } # Rules to clean the package diff -r 67528625d306 -r 9e01bc6321ea mingw32-w32api/receipt --- a/mingw32-w32api/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/mingw32-w32api/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -54,9 +54,7 @@ post_install() { # Archives get stripped during packaging; need to run ranlib - local root - root=$1 - find $root/usr/$MINGW32_ID/lib/ -name *.a -exec $MINGW32_ID-ranlib {} \; + find "$1/usr/$MINGW32_ID/lib/" -name *.a -exec $MINGW32_ID-ranlib {} \; } # Rules to clean the package diff -r 67528625d306 -r 9e01bc6321ea mist-icon-theme/receipt --- a/mist-icon-theme/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/mist-icon-theme/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -26,10 +26,10 @@ post_install() { - sed '/Inherits=/s|=.*$|=mist|' -i $1/$qtfix + sed '/Inherits=/s|=.*$|=mist|' -i "$1/$qtfix" } pre_remove() { - sed '/Inherits=/s|=.*$|=SliTaz|' -i $1/$qtfix + sed '/Inherits=/s|=.*$|=SliTaz|' -i "$1/$qtfix" } diff -r 67528625d306 -r 9e01bc6321ea mk-livestatus/receipt --- a/mk-livestatus/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/mk-livestatus/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -33,7 +33,7 @@ { echo "Processing post-install commands..." # Modify nagios config - cat <> $1/etc/nagios/nagios.cfg + cat <> "$1/etc/nagios/nagios.cfg" broker_module=/usr/lib/mk-livestatus/livestatus.o /var/lib/nagios/rw/live event_broker_options=-1 EOT diff -r 67528625d306 -r 9e01bc6321ea module-init-tools/receipt --- a/module-init-tools/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/module-init-tools/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -52,20 +52,20 @@ # Remove Busybox symlink before installing pre_install() { - rm -f $1/sbin/insmod - rm -f $1/sbin/modinfo - rm -f $1/sbin/modprobe - rm -f $1/sbin/rmmod + rm -f "$1/sbin/insmod" + rm -f "$1/sbin/modinfo" + rm -f "$1/sbin/modprobe" + rm -f "$1/sbin/rmmod" # BusyBox puts lsmod in /sbin, not /bin - rm -f $1/sbin/lsmod + rm -f "$1/sbin/lsmod" } post_remove() { - ln -s /bin/busybox $1/sbin/insmod - ln -s /bin/busybox $1/sbin/modinfo - ln -s /bin/busybox $1/sbin/modprobe - ln -s /bin/busybox $1/sbin/rmmod + ln -s /bin/busybox "$1/sbin/insmod" + ln -s /bin/busybox "$1/sbin/modinfo" + ln -s /bin/busybox "$1/sbin/modprobe" + ln -s /bin/busybox "$1/sbin/rmmod" # BusyBox puts lsmod in /sbin, not /bin - ln -s /bin/busybox $1/sbin/lsmod + ln -s /bin/busybox "$1/sbin/lsmod" } diff -r 67528625d306 -r 9e01bc6321ea monitorix/receipt --- a/monitorix/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/monitorix/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -38,9 +38,9 @@ post_install() { # Configure lighttpd server - if [ -f $1/etc/lighttpd/lighttpd.conf ]; then - if ! grep -q /usr/share/monitorix/ $1/etc/lighttpd/lighttpd.conf; then - sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/monitorix/" => "/usr/share/monitorix/",\n "/monitorix-cgi/" => "/usr/share/monitorix/cgi/",|g' -i $1/etc/lighttpd/lighttpd.conf + if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then + if ! grep -q /usr/share/monitorix/ "$1/etc/lighttpd/lighttpd.conf"; then + sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/monitorix/" => "/usr/share/monitorix/",\n "/monitorix-cgi/" => "/usr/share/monitorix/cgi/",|g' -i "$1/etc/lighttpd/lighttpd.conf" if [ -z "$1" ]; then # Start Web server. /etc/init.d/lighttpd stop @@ -49,9 +49,9 @@ fi fi # Configure apache server - if [ -f $1/etc/apache/httpd.conf ]; then - if [ ! -f $1/etc/apache/conf.d/monitorix ]; then - cat > $1/etc/apache/conf.d/monitorix < "$1/etc/apache/conf.d/monitorix" <> $1/etc/services - grep -q ^munin $1/etc/inetd.conf || cat >> $1/etc/inetd.conf <> "$1/etc/services" + grep -q ^munin "$1/etc/inetd.conf" || cat >> "$1/etc/inetd.conf" <> $1/etc/nagios/nagios.cfg + echo "cfg_file=/etc/nagios/objects/nrpe.cfg" >> "$1/etc/nagios/nagios.cfg" } post_remove() { - [ -f $1/etc/nagios/nagios.cfg ] && sed -i 's/.*nrpe.cfg//' $1/etc/nagios/nagios.cfg + [ -f "$1/etc/nagios/nagios.cfg" ] && sed -i 's/.*nrpe.cfg//' "$1/etc/nagios/nagios.cfg" } diff -r 67528625d306 -r 9e01bc6321ea nagios-plugins/receipt --- a/nagios-plugins/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/nagios-plugins/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -48,18 +48,18 @@ post_install() { - if ! grep -q nagios $1/etc/passwd; then + if ! grep -q nagios "$1/etc/passwd"; then echo -n "Adding user/group nagios..." - chroot $1/ addgroup -S nagios - chroot $1/ adduser -S -D -H -G nagios nagios + chroot "$1/" addgroup -S nagios + chroot "$1/" adduser -S -D -H -G nagios nagios status fi - if [ -f $1/etc/nagios/resource.cfg ]; then + if [ -f "$1/etc/nagios/resource.cfg" ]; then sed -i 's|/usr/lib/nagios|/usr/lib/nagios/plugins|' \ - $1/etc/nagios/resource.cfg + "$1/etc/nagios/resource.cfg" fi # Set perms for files and directories - chroot $1/ chown -R nagios.nagios /usr/lib/nagios/plugins - chroot $1/ chown -R nagios.nagios /etc/nagios/objects + chroot "$1/" chown -R nagios.nagios /usr/lib/nagios/plugins + chroot "$1/" chown -R nagios.nagios /etc/nagios/objects } diff -r 67528625d306 -r 9e01bc6321ea nagios/receipt --- a/nagios/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/nagios/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -84,26 +84,26 @@ post_install() { - if ! grep -q nagios $1/etc/passwd; then + if ! grep -q nagios "$1/etc/passwd"; then echo -n "Adding user/group nagios..." - chroot $1/ addgroup -S nagios - chroot $1/ adduser -S -D -H -G nagios nagios + chroot "$1/" addgroup -S nagios + chroot "$1/" adduser -S -D -H -G nagios nagios status fi # Fix perms for files and directories - chroot $1/ chown -R nagios.nagios /var/log/nagios \ + chroot "$1/" chown -R nagios.nagios /var/log/nagios \ /var/spool/nagios \ /var/lib/nagios \ /usr/share/nagios \ /etc/nagios/* - chmod 2775 $1/var/lib/nagios/rw - chroot $1/ addgroup www nagios + chmod 2775 "$1/var/lib/nagios/rw" + chroot "$1/" addgroup www nagios # Start Nagios daemon if we are on running system - [ -z $1 ] && /etc/init.d/nagios start + [ "$1" ] || /etc/init.d/nagios start # post_install messges echo -e "\nTo starts $PACKAGE server you can run :\n" @@ -114,5 +114,5 @@ pre_remove() { - [ -z $1 ] && /etc/init.d/nagios stop + [ "$1" ] || /etc/init.d/nagios stop } diff -r 67528625d306 -r 9e01bc6321ea nagisk/receipt --- a/nagisk/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/nagisk/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -24,8 +24,8 @@ # Pre and post install commands for Tazpkg. post_install() { - grep -qs check_asterisk_version $1/etc/nagios/nrpe.cfg || - cat >> $1/etc/nagios/nrpe.cfg <> "$1/etc/nagios/nrpe.cfg" <> $1/etc/sudoers <> "$1/etc/sudoers" < "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/nareto/" => "/usr/share/nareto",|g' -i $1/etc/lighttpd/lighttpd.conf + if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then + if ! grep -q /usr/share/nareto/ "$1/etc/lighttpd/lighttpd.conf"; then + sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/nareto/" => "/usr/share/nareto",|g' -i "$1/etc/lighttpd/lighttpd.conf" if [ -z "$1" ]; then # Start Web server. /etc/init.d/lighttpd stop @@ -101,10 +101,10 @@ fi # Configure apache server - if [ -f $1/etc/apache/httpd.conf ]; then - sed -i 's/lighttpd/apache/' $1/etc/rcS.conf - if [ ! -f $1/etc/apache/conf.d/nareto ]; then - cat > $1/etc/apache/conf.d/nareto < "$1/etc/apache/conf.d/nareto" < Options None diff -r 67528625d306 -r 9e01bc6321ea ncmpcpp/receipt --- a/ncmpcpp/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/ncmpcpp/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -40,13 +40,13 @@ post_install() { - for i in $(ls $1/home 2> /dev/null); do - [ -d $1/home/$i/.ncmpcpp ] && continue + for i in $(ls "$1/home" 2> /dev/null); do + [ -d "$1/home/$i/.ncmpcpp" ] && continue echo -n "Enabling configuration files for $i ..." - cp -a $1/etc/skel/.ncmpcpp $1/home/$i/ - sed -i 's|#mpd_music_dir = ""|mpd_music_dir = "/home/'$i'/music"|' /home/$i/.ncmpcpp/config + cp -a "$1/etc/skel/.ncmpcpp" "$1/home/$i/" + sed -i 's|#mpd_music_dir = ""|mpd_music_dir = "/home/'$i'/music"|' "/home/$i/.ncmpcpp/config" # Change permissions also - chroot $1/ chown -R $(stat -c "%u.%g" $1/home/$i) /home/$i/.ncmpcpp + chroot "$1/" chown -R $(stat -c "%u.%g" "$1/home/$i") "/home/$i/.ncmpcpp" done status } diff -r 67528625d306 -r 9e01bc6321ea nconf/receipt --- a/nconf/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/nconf/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -68,7 +68,7 @@ local sql_script='/var/lib/nconf/INSTALL/create_database.sql' # Minimal config for NConf. - if [ -z $1 ]; then + if [ -z "$1" ]; then if ( ! mysqladmin -s ping > /dev/null ); then echo "Starting MySQL server" ( /etc/init.d/mysql start ; status ) || exit @@ -92,7 +92,7 @@ post_remove() { - if [ -z $1 ]; then + if [ -z "$1" ]; then local db=nconf local db_user=nconf local db_password=nconf diff -r 67528625d306 -r 9e01bc6321ea ndoutils/receipt --- a/ndoutils/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/ndoutils/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -72,22 +72,22 @@ post_install() { - if ! grep -q nagios $1/etc/passwd; then + if ! grep -q nagios "$1/etc/passwd"; then echo -n "Adding user nagios..." - chroot $1/ adduser -S -D -H nagios + chroot "$1/" adduser -S -D -H nagios status fi - if ! grep -q ndomod.cfg $1/etc/nagios/nagios.cfg; then - sed -i '/LOG ROTATION METHOD/i\broker_module=/usr/lib/ndoutils/ndomod.o config_file=/etc/nagios/ndomod.cfg' $1/etc/nagios/nagios.cfg - chroot $1/ chown nagios.nagios $1/etc/nagios/nagios.cfg + if ! grep -q ndomod.cfg "$1/etc/nagios/nagios.cfg"; then + sed -i '/LOG ROTATION METHOD/i\broker_module=/usr/lib/ndoutils/ndomod.o config_file=/etc/nagios/ndomod.cfg' "$1/etc/nagios/nagios.cfg" + chroot "$1/" chown nagios.nagios /etc/nagios/nagios.cfg fi - chroot $1/ chown nagios.nagios $fs/usr/lib/ndoutils/ndomod.o \ - $fs/etc/nagios/ndo2db.cfg $fs/etc/nagios/ndomod.cfg \ - $fs/etc/nagios + chroot "$1/" chown nagios.nagios /usr/lib/ndoutils/ndomod.o \ + /etc/nagios/ndo2db.cfg /etc/nagios/ndomod.cfg \ + /etc/nagios - sed -i "s/nagios/ndo2db nagios/" $1/etc/rcS.conf + sed -i "s/nagios/ndo2db nagios/" "$1/etc/rcS.conf" if [ -z "$1" ]; then [ -f /var/run/mysqld/mysql.pid ] || /etc/init.d/mysql start @@ -107,7 +107,7 @@ post_remove() { - sed -i "s/ndo2db//" $1/etc/rcS.conf + sed -i "s/ndo2db//" "$1/etc/rcS.conf" /etc/init.d/nagios restart - sed -i 's|broker_module=/usr/lib/ndoutils/ndomod.o config_file=/etc/nagios/ndomod.cfg||' $1/etc/nagios/nagios.cfg + sed -i 's|broker_module=/usr/lib/ndoutils/ndomod.o config_file=/etc/nagios/ndomod.cfg||' "$1/etc/nagios/nagios.cfg" } diff -r 67528625d306 -r 9e01bc6321ea netatalk-pam/receipt --- a/netatalk-pam/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/netatalk-pam/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -57,10 +57,10 @@ # Overlap busybox pre_install() { - rm -f $1/usr/bin/timeout + rm -f "$1/usr/bin/timeout" } post_remove() { - ln -s /bin/busybox /usr/bin/timeout + ln -s /bin/busybox "$1/usr/bin/timeout" } diff -r 67528625d306 -r 9e01bc6321ea nfs-utils/receipt --- a/nfs-utils/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/nfs-utils/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -52,9 +52,9 @@ post_install() { - grep ^nfs $1/etc/services || - sed -i 's|.* 2401/tcp.*|nfs 2049/tcp\nnfs 2049/udp\n&|' $1/etc/services - [ -s $1/etc/exports ] || cat > $1/etc/exports < "$1/etc/exports" < /dev/null && - openssl req -new -x509 -keyout $1/usr/share/novnc/self.pem \ - -out $1/usr/share/novnc/self.pem -days 3650 -nodes <> $1/etc/filesystems + grep -qs ^$PACKAGE$ "$1/etc/filesystems" || \ + echo "$PACKAGE" >> "$1/etc/filesystems" } diff -r 67528625d306 -r 9e01bc6321ea ntop/receipt --- a/ntop/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/ntop/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -56,18 +56,18 @@ user=ntop group=ntop - if ! grep -q $user: $1/etc/passwd; then + if ! grep -q $user: "$1/etc/passwd"; then echo -n "Adding user/group $user..." - chroot $1/ addgroup -S $user - chroot $1/ adduser -S -D -H -G $group $user + chroot "$1/" addgroup -S $user + chroot "$1/" adduser -S -D -H -G $group $user status fi # Fix perms for files and directories - chroot $1/ chown -R ${user}.${group} /var/lib/ntop /var/log/ntop + chroot "$1/" chown -R ${user}.${group} /var/lib/ntop /var/log/ntop # Start package daemon if we are on running system - [ -z $1 ] && /etc/init.d/$PACKAGE start + [ "$1" ] || /etc/init.d/$PACKAGE start # post_install messges echo -e "\nTo starts $PACKAGE server you can run :\n" @@ -77,7 +77,7 @@ pre_remove() { - [ -z $1 ] && /etc/init.d/$PACKAGE stop + [ "$1" ] || /etc/init.d/$PACKAGE stop } post_remove() @@ -85,10 +85,10 @@ user=ntop group=ntop - if ! grep -q $user: $1/etc/passwd; then + if ! grep -q $user: "$1/etc/passwd"; then echo -n "Removing user/group $user..." - chroot $1/ delgroup $user - chroot $1/ deluser $user + chroot "$1/" delgroup $user + chroot "$1/" deluser $user status fi } diff -r 67528625d306 -r 9e01bc6321ea nvidia-173xx/receipt --- a/nvidia-173xx/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/nvidia-173xx/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -90,8 +90,8 @@ chroot "$root/" depmod -a ${EXTRAVERSION#_}-slitaz # correct .desktop file file - sed -i 's:__UTILS_PATH__/::' $1/usr/share/applications/nvidia-settings.desktop - sed -i 's:__PIXMAP_PATH__/::' $1/usr/share/applications/nvidia-settings.desktop + sed -i 's:__UTILS_PATH__/::' "$1/usr/share/applications/nvidia-settings.desktop" + sed -i 's:__PIXMAP_PATH__/::' "$1/usr/share/applications/nvidia-settings.desktop" echo "" echo -e "\033[1m NVIDIA LICENSE INFORMATION:\033[0m $2" diff -r 67528625d306 -r 9e01bc6321ea nvidia-96xx/receipt --- a/nvidia-96xx/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/nvidia-96xx/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -76,8 +76,8 @@ chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz # correct .desktop file file - sed -i 's:__UTILS_PATH__/::' $1/usr/share/applications/nvidia-settings.desktop - sed -i 's:__PIXMAP_PATH__/::' $1/usr/share/applications/nvidia-settings.desktop + sed -i 's:__UTILS_PATH__/::' "$1/usr/share/applications/nvidia-settings.desktop" + sed -i 's:__PIXMAP_PATH__/::' "$1/usr/share/applications/nvidia-settings.desktop" echo "" echo -e "\033[1m NVIDIA LICENSE INFORMATION:\033[0m $2" diff -r 67528625d306 -r 9e01bc6321ea nzbget-webui/receipt --- a/nzbget-webui/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/nzbget-webui/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -21,9 +21,9 @@ post_install() { # Configure lighttpd server - if [ -f $1/etc/lighttpd/lighttpd.conf ]; then - if ! grep -q /usr/share/nzbget/ $1/etc/lighttpd/lighttpd.conf; then - sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/nzbget/" => "/usr/share/nzbget/webui/",|g' -i $1/etc/lighttpd/lighttpd.conf + if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then + if ! grep -q /usr/share/nzbget/ "$1/etc/lighttpd/lighttpd.conf"; then + sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/nzbget/" => "/usr/share/nzbget/webui/",|g' -i "$1/etc/lighttpd/lighttpd.conf" if [ -z "$1" ]; then # Start Web server. /etc/init.d/lighttpd stop @@ -32,9 +32,9 @@ fi fi # Configure apache server - if [ -f $1/etc/apache/httpd.conf ]; then - if [ ! -f $1/etc/apache/conf.d/nzbget ]; then - cat > $1/etc/apache/conf.d/nzbget < "$1/etc/apache/conf.d/nzbget" < Alias /nzbget /usr/share/nzbget/webui diff -r 67528625d306 -r 9e01bc6321ea obmenu/receipt --- a/obmenu/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/obmenu/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -32,13 +32,13 @@ post_install() { echo -n "Enabling configuration file..." - cp $1/home/tux/.config/openbox/menu.xml $1/root/.config/openbox + cp "$1/home/tux/.config/openbox/menu.xml" "$1/root/.config/openbox" status } post_remove() { echo -n "Removing configuration files..." - rm $1/root/.config/openbox/menu.xml + rm "$1/root/.config/openbox/menu.xml" status } diff -r 67528625d306 -r 9e01bc6321ea ocsinventory-agent/receipt --- a/ocsinventory-agent/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/ocsinventory-agent/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -49,15 +49,15 @@ post_install(){ echo "Processing post-install commands..." - cat > $1/etc/ocsinventory-agent/ocsinventory-agent.cfg < "$1/etc/ocsinventory-agent/ocsinventory-agent.cfg" < $1/etc/apache/conf.d/$PACKAGE < "$1/etc/apache/conf.d/$PACKAGE" < Alias /$PACKAGE /usr/share/$PACKAGE/ @@ -66,7 +66,7 @@ fi # Configure every thing for ocsweb. - if [ -z $1 ]; then + if [ -z "$1" ]; then if ( ! mysqladmin -s ping > /dev/null ); then echo "Starting MySQL server" ( /etc/init.d/mysql start ; status ) || exit @@ -90,7 +90,7 @@ post_remove() { - if [ -z $1 ]; then + if [ -z "$1" ]; then echo -n "Would you like to remove data and database files.(y/n) " read answer diff -r 67528625d306 -r 9e01bc6321ea open-iscsi/receipt --- a/open-iscsi/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/open-iscsi/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -34,7 +34,7 @@ post_install() { echo "Processing post-install commands..." - if [ ! -f $1/etc/iscsi/initiatorname.iscsi ]; then - echo "InitiatorName=$($1/sbin/iscsi-iname)" > $1/etc/iscsi/initiatorname.iscsi + if [ ! -f "$1/etc/iscsi/initiatorname.iscsi" ]; then + echo "InitiatorName=$($1/sbin/iscsi-iname)" > "$1/etc/iscsi/initiatorname.iscsi" fi } diff -r 67528625d306 -r 9e01bc6321ea openerp-server/receipt --- a/openerp-server/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/openerp-server/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -36,8 +36,8 @@ # Pre and post install commands for Tazpkg. post_install() { - #chroot $1/ adduser -H -D -S -s /bin/false -h /dev/null -g "OpenERP Daemon user" openerp - [ -z "$1" ] && /etc/init.d/$PACKAGE start + #chroot "$1/" adduser -H -D -S -s /bin/false -h /dev/null -g "OpenERP Daemon user" openerp + [ "$1" ] || /etc/init.d/$PACKAGE start cat < "$1$openssh.pub" - dropbearkey -y -f "$1$dropbear" | grep Fingerprint + chroot "$1/" dropbearconvert dropbear openssh $dropbear $openssh + chroot "$1/" dropbearkey -y -f $dropbear | grep ssh > "$1$openssh.pub" + chroot "$1/" dropbearkey -y -f $dropbear | grep Fingerprint done < "$1$openssh.pub" - dropbearkey -y -f "$1$dropbear" | grep Fingerprint + chroot "$1/" dropbearconvert dropbear openssh $dropbear $openssh + chroot "$1/" dropbearkey -y -f $dropbear | grep ssh > "$1$openssh.pub" + chroot "$1/" dropbearkey -y -f $dropbear | grep Fingerprint done <> $root/etc/daemons.conf - echo 'PCSCD_OPTIONS=""' >> $root/etc/daemons.conf - echo '' >> $root/etc/daemons.conf + if ! grep -q 'PCSCD_OPTIONS' "$1/etc/daemons.conf"; then + echo '# PC/SC smart card daemon options.' >> "$1/etc/daemons.conf" + echo 'PCSCD_OPTIONS=""' >> "$1/etc/daemons.conf" + echo '' >> "$1/etc/daemons.conf" fi } diff -r 67528625d306 -r 9e01bc6321ea pdnsd/receipt --- a/pdnsd/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/pdnsd/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -33,19 +33,19 @@ # Pre and post install commands for Tazpkg. pre_remove() { - sed -i 's/pdnsd//' $1/etc/rcS.conf - rm -f $1/etc/init.d/pdnsd + sed -i 's/pdnsd//' "$1/etc/rcS.conf" + rm -f "$1/etc/init.d/pdnsd" } post_install() { local tmp tmp=$(route -n | awk '/^0.0.0.0/ { print $8; }') - [ -n "$tmp" ] && sed -i "s/eth0/$tmp/" $1/etc/pdnsd.conf + [ -n "$tmp" ] && sed -i "s/eth0/$tmp/" "$1/etc/pdnsd.conf" tmp=$(sed '/nameserver/!d;s/nameserver //;q' < /etc/resolv.conf) - [ -n "$tmp" ] && sed -i "s/192\.168\.0\.1/$tmp/" $1/etc/pdnsd.conf + [ -n "$tmp" ] && sed -i "s/192\.168\.0\.1/$tmp/" "$1/etc/pdnsd.conf" tmp= - [ -s $1/etc/init.d/daemon ] && ln -s daemon $1/etc/init.d/pdnsd && + [ -s "$1/etc/init.d/daemon" ] && ln -s daemon "$1/etc/init.d/pdnsd" && tmp=" and add pdnsd to RUN_DAEMONS in /etc/rcS.conf" cat < $1/etc/apache/conf.d/phpinfo < "$1/etc/apache/conf.d/phpinfo" < Alias /phpinfo /usr/share/phpinfo diff -r 67528625d306 -r 9e01bc6321ea php-auth-pam/receipt --- a/php-auth-pam/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/php-auth-pam/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -38,8 +38,8 @@ post_install() { - grep -q ^extension=pam_auth.so $1/etc/php.ini || \ - sed -e 's|extension=msql.so|extension=msql.so\nextension=pam_auth.so|' -i $1/etc/php.ini + grep -q ^extension=pam_auth.so "$1/etc/php.ini" || \ + sed -e 's|extension=msql.so|extension=msql.so\nextension=pam_auth.so|' -i "$1/etc/php.ini" # Start Web server. while read daemon file; do [ -z "$1" ] || continue diff -r 67528625d306 -r 9e01bc6321ea php-cherokee/receipt --- a/php-cherokee/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/php-cherokee/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -31,19 +31,19 @@ post_install() { # Enable php -# if [ -f $1/etc/lighttpd/lighttpd.conf ]; then -# [ -f $1/usr/lib/lighttpd/mod_fastcgi.so ] || \ -# tazpkg get-install lighttpd-modules --root=$1/ +# if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then +# [ -f "$1/usr/lib/lighttpd/mod_fastcgi.so" ] || \ +# tazpkg get-install lighttpd-modules --root="$1/" # sed -e 's|#fastcgi.server = ( ".php"|fastcgi.server = ( ".php"|' \ # -e 's|#"bin-path" => "/usr/bin/php-cgi"|"bin-path" => "/usr/bin/php-cgi"|' \ # -e 's|#"socket" => "/tmp/php.socket"|"socket" => "/tmp/php.socket"\n )))|' \ -# -i $1/etc/lighttpd/lighttpd.conf -# grep -q mod_fastcgi $1/etc/lighttpd/lighttpd.conf || \ +# -i "$1/etc/lighttpd/lighttpd.conf" +# grep -q mod_fastcgi "$1/etc/lighttpd/lighttpd.conf" || \ # sed -e 's|server.modules = (|server.modules = (\n "mod_fastcgi",|' \ -# -i $1/etc/lighttpd/lighttpd.conf -# grep -q php3 $1/etc/lighttpd/lighttpd.conf || \ +# -i "$1/etc/lighttpd/lighttpd.conf" +# grep -q php3 "$1/etc/lighttpd/lighttpd.conf" || \ # sed -e 's|for PHP.*|for PHP.\nfastcgi.map-extensions = ( ".php3" => ".php", ".php4" => ".php", ".php5" => ".php" )|' \ -# -i $1/etc/lighttpd/lighttpd.conf +# -i "$1/etc/lighttpd/lighttpd.conf" # fi diff -r 67528625d306 -r 9e01bc6321ea php-common/receipt --- a/php-common/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/php-common/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -28,7 +28,7 @@ # Backup existing php.ini if [ -f "$1/etc/php.ini" ]; then echo -n "Creating php.ini backup..." - cp $1/etc/php.ini $1/etc/php.ini.bak + cp "$1/etc/php.ini" "$1/etc/php.ini.bak" status fi } @@ -37,7 +37,7 @@ # Restore original php.ini if [ -f "$1/etc/php.ini.bak" ]; then echo -n "Restoring php.ini backup..." - mv -f $1/etc/php.ini.bak $1/etc/php.ini + mv -f "$1/etc/php.ini.bak" "$1/etc/php.ini" status fi } diff -r 67528625d306 -r 9e01bc6321ea php-curl/receipt --- a/php-curl/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/php-curl/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -34,8 +34,8 @@ post_install() { - grep -q ^extension=curl.so $1/etc/php.ini || \ - sed -e 's|extension=msql.so|extension=msql.so\nextension=curl.so|' -i $1/etc/php.ini + grep -q ^extension=curl.so "$1/etc/php.ini" || \ + sed -e 's|extension=msql.so|extension=msql.so\nextension=curl.so|' -i "$1/etc/php.ini" # Start Web server. while read daemon file; do [ -z "$1" ] || continue diff -r 67528625d306 -r 9e01bc6321ea php-dba/receipt --- a/php-dba/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/php-dba/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -32,8 +32,8 @@ post_install() { - grep -q ^extension=dba.so $1/etc/php.ini || \ - sed -e 's|extension=msql.so|extension=msql.so\nextension=dba.so|' -i $1/etc/php.ini + grep -q ^extension=dba.so "$1/etc/php.ini" || \ + sed -e 's|extension=msql.so|extension=msql.so\nextension=dba.so|' -i "$1/etc/php.ini" # Start Web server. while read daemon file; do [ -z "$1" ] || continue diff -r 67528625d306 -r 9e01bc6321ea php-gd/receipt --- a/php-gd/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/php-gd/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -34,8 +34,8 @@ post_install() { - grep -q ^extension=gd.so $1/etc/php.ini || \ - sed -e 's|extension=msql.so|extension=msql.so\nextension=gd.so|' -i $1/etc/php.ini + grep -q ^extension=gd.so "$1/etc/php.ini" || \ + sed -e 's|extension=msql.so|extension=msql.so\nextension=gd.so|' -i "$1/etc/php.ini" # Start Web server. while read daemon file; do [ -z "$1" ] || continue @@ -55,7 +55,7 @@ # Pre and post remove commands for Tazpkg. pre_remove() { - sed -i '/.*=gd.so.*/d' $1/etc/php.ini + sed -i '/.*=gd.so.*/d' "$1/etc/php.ini" # Start Web server. while read daemon file; do diff -r 67528625d306 -r 9e01bc6321ea php-imap/receipt --- a/php-imap/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/php-imap/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -34,8 +34,8 @@ post_install() { - grep -q ^extension=imap.so $1/etc/php.ini || \ - sed -e 's|extension=msql.so|extension=msql.so\nextension=imap.so|' -i $1/etc/php.ini + grep -q ^extension=imap.so "$1/etc/php.ini" || \ + sed -e 's|extension=msql.so|extension=msql.so\nextension=imap.so|' -i "$1/etc/php.ini" # Start Web server. while read daemon file; do [ -z "$1" ] || continue diff -r 67528625d306 -r 9e01bc6321ea php-ldap/receipt --- a/php-ldap/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/php-ldap/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -34,8 +34,8 @@ post_install() { - grep -q ^extension=ldap.so $1/etc/php.ini || \ - sed -e 's|extension=msql.so|extension=msql.so\nextension=ldap.so|' -i $1/etc/php.ini + grep -q ^extension=ldap.so "$1/etc/php.ini" || \ + sed -e 's|extension=msql.so|extension=msql.so\nextension=ldap.so|' -i "$1/etc/php.ini" # Start Web server. while read daemon file; do [ -z "$1" ] || continue diff -r 67528625d306 -r 9e01bc6321ea php-mcrypt/receipt --- a/php-mcrypt/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/php-mcrypt/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -34,8 +34,8 @@ post_install() { - grep -q ^extension=mcrypt.so $1/etc/php.ini || \ - sed -e 's|extension=msql.so|extension=msql.so\nextension=mcrypt.so|' -i $1/etc/php.ini + grep -q ^extension=mcrypt.so "$1/etc/php.ini" || \ + sed -e 's|extension=msql.so|extension=msql.so\nextension=mcrypt.so|' -i "$1/etc/php.ini" # Start Web server. while read daemon file; do [ -z "$1" ] || continue diff -r 67528625d306 -r 9e01bc6321ea php-mysql/receipt --- a/php-mysql/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/php-mysql/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -34,8 +34,8 @@ post_install() { - grep -q ^extension=mysql.so $1/etc/php.ini || \ - sed -e 's|extension=msql.so|extension=msql.so\nextension=mysql.so|' -i $1/etc/php.ini + grep -q ^extension=mysql.so "$1/etc/php.ini" || \ + sed -e 's|extension=msql.so|extension=msql.so\nextension=mysql.so|' -i "$1/etc/php.ini" # Start Web server. while read daemon file; do [ -z "$1" ] || continue diff -r 67528625d306 -r 9e01bc6321ea php-mysqli/receipt --- a/php-mysqli/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/php-mysqli/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -34,8 +34,8 @@ post_install() { - grep -q ^extension=mysqli.so $1/etc/php.ini || \ - sed -e 's|extension=msql.so|extension=msql.so\nextension=mysqli.so|' -i $1/etc/php.ini + grep -q ^extension=mysqli.so "$1/etc/php.ini" || \ + sed -e 's|extension=msql.so|extension=msql.so\nextension=mysqli.so|' -i "$1/etc/php.ini" # Start Web server. while read daemon file; do [ -z "$1" ] || continue diff -r 67528625d306 -r 9e01bc6321ea php-odbc/receipt --- a/php-odbc/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/php-odbc/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -34,8 +34,8 @@ post_install() { - grep -q ^extension=odbc.so $1/etc/php.ini || \ - sed -e 's|extension=msql.so|extension=msql.so\nextension=odbc.so|' -i $1/etc/php.ini + grep -q ^extension=odbc.so "$1/etc/php.ini" || \ + sed -e 's|extension=msql.so|extension=msql.so\nextension=odbc.so|' -i "$1/etc/php.ini" # Start Web server. while read daemon file; do [ -z "$1" ] || continue diff -r 67528625d306 -r 9e01bc6321ea php-openssl/receipt --- a/php-openssl/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/php-openssl/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -34,8 +34,8 @@ post_install() { - grep -q ^extension=openssl.so $1/etc/php.ini || \ - sed -e 's|extension=msql.so|extension=msql.so\nextension=openssl.so|' -i $1/etc/php.ini + grep -q ^extension=openssl.so "$1/etc/php.ini" || \ + sed -e 's|extension=msql.so|extension=msql.so\nextension=openssl.so|' -i "$1/etc/php.ini" # Start Web server. while read daemon file; do [ -z "$1" ] || continue diff -r 67528625d306 -r 9e01bc6321ea php-pdo-mysql/receipt --- a/php-pdo-mysql/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/php-pdo-mysql/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -34,8 +34,8 @@ post_install() { - grep -q ^extension=pdo_mysql.so $1/etc/php.ini || \ - sed -e 's|extension=msql.so|extension=msql.so\nextension=pdo_mysql.so|' -i $1/etc/php.ini + grep -q ^extension=pdo_mysql.so "$1/etc/php.ini" || \ + sed -e 's|extension=msql.so|extension=msql.so\nextension=pdo_mysql.so|' -i "$1/etc/php.ini" # Start Web server. while read daemon file; do [ -z "$1" ] || continue diff -r 67528625d306 -r 9e01bc6321ea php-pdo-pgsql/receipt --- a/php-pdo-pgsql/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/php-pdo-pgsql/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -34,8 +34,8 @@ post_install() { - grep -q ^extension=pdo_pgsql.so $1/etc/php.ini || \ - sed -e 's|extension=msql.so|extension=msql.so\nextension=pdo_pgsql.so|' -i $1/etc/php.ini + grep -q ^extension=pdo_pgsql.so "$1/etc/php.ini" || \ + sed -e 's|extension=msql.so|extension=msql.so\nextension=pdo_pgsql.so|' -i "$1/etc/php.ini" # Start Web server. while read daemon file; do [ -z "$1" ] || continue diff -r 67528625d306 -r 9e01bc6321ea php-pear/receipt --- a/php-pear/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/php-pear/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -35,8 +35,8 @@ post_install() { - grep ^include_path $1/etc/php.ini - sed -i 's|/php/includes"|/php/includes"\ninclude_path = ".:/usr/share/php"|' $1/etc/php.ini + grep ^include_path "$1/etc/php.ini" + sed -i 's|/php/includes"|/php/includes"\ninclude_path = ".:/usr/share/php"|' "$1/etc/php.ini" # Restart Web server. while read daemon file; do [ -z "$1" ] || continue diff -r 67528625d306 -r 9e01bc6321ea php-pgsql/receipt --- a/php-pgsql/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/php-pgsql/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -34,8 +34,8 @@ post_install() { - grep -q ^extension=pgsql.so $1/etc/php.ini || \ - sed -e 's|extension=msql.so|extension=msql.so\nextension=pgsql.so|' -i $1/etc/php.ini + grep -q ^extension=pgsql.so "$1/etc/php.ini" || \ + sed -e 's|extension=msql.so|extension=msql.so\nextension=pgsql.so|' -i "$1/etc/php.ini" # Start Web server. while read daemon file; do [ -z "$1" ] || continue diff -r 67528625d306 -r 9e01bc6321ea php-snmp/receipt --- a/php-snmp/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/php-snmp/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -34,8 +34,8 @@ post_install() { - grep -q ^extension=snmp.so $1/etc/php.ini || \ - sed -e 's|extension=msql.so|extension=msql.so\nextension=snmp.so|' -i $1/etc/php.ini + grep -q ^extension=snmp.so "$1/etc/php.ini" || \ + sed -e 's|extension=msql.so|extension=msql.so\nextension=snmp.so|' -i "$1/etc/php.ini" # Start Web server. while read daemon file; do [ -z "$1" ] || continue diff -r 67528625d306 -r 9e01bc6321ea php-soap/receipt --- a/php-soap/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/php-soap/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -34,8 +34,8 @@ post_install() { - grep -q ^extension=soap.so $1/etc/php.ini || \ - sed -e 's|extension=msql.so|extension=msql.so\nextension=soap.so|' -i $1/etc/php.ini + grep -q ^extension=soap.so "$1/etc/php.ini" || \ + sed -e 's|extension=msql.so|extension=msql.so\nextension=soap.so|' -i "$1/etc/php.ini" # Start Web server. while read daemon file; do [ -z "$1" ] || continue diff -r 67528625d306 -r 9e01bc6321ea php-sqlite/receipt --- a/php-sqlite/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/php-sqlite/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -22,8 +22,8 @@ post_install() { - grep -q ^extension=sqlite3.so $1/etc/php.ini || \ - sed -e 's|extension=msql.so|extension=msql.so\nextension=sqlite3.so|' -i $1/etc/php.ini + grep -q ^extension=sqlite3.so "$1/etc/php.ini" || \ + sed -e 's|extension=msql.so|extension=msql.so\nextension=sqlite3.so|' -i "$1/etc/php.ini" # Start Web server. while read daemon file; do [ -z "$1" ] || continue diff -r 67528625d306 -r 9e01bc6321ea php/receipt --- a/php/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/php/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -127,19 +127,19 @@ post_install() { # Enable php - if [ -f $1/etc/lighttpd/lighttpd.conf ]; then - [ -f $1/usr/lib/lighttpd/mod_fastcgi.so ] || \ - tazpkg get-install lighttpd-modules --root=$1/ + if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then + [ -f "$1/usr/lib/lighttpd/mod_fastcgi.so" ] || \ + tazpkg get-install lighttpd-modules --root="$1/" sed -e 's|#fastcgi.server = ( ".php"|fastcgi.server = ( ".php"|' \ -e 's|#"bin-path" => "/usr/bin/php-cgi"|"bin-path" => "/usr/bin/php-cgi"|' \ -e 's|#"socket" => "/tmp/php.socket"|"socket" => "/tmp/php.socket"\n )))|' \ - -i $1/etc/lighttpd/lighttpd.conf - grep -q mod_fastcgi $1/etc/lighttpd/lighttpd.conf || \ + -i "$1/etc/lighttpd/lighttpd.conf" + grep -q mod_fastcgi "$1/etc/lighttpd/lighttpd.conf" || \ sed -e 's|server.modules = (|server.modules = (\n "mod_fastcgi",|' \ - -i $1/etc/lighttpd/lighttpd.conf - grep -q php3 $1/etc/lighttpd/lighttpd.conf || \ + -i "$1/etc/lighttpd/lighttpd.conf" + grep -q php3 "$1/etc/lighttpd/lighttpd.conf" || \ sed -e 's|for PHP.*|for PHP.\nfastcgi.map-extensions = ( ".php3" => ".php", ".php4" => ".php", ".php5" => ".php" )|' \ - -i $1/etc/lighttpd/lighttpd.conf + -i "$1/etc/lighttpd/lighttpd.conf" fi # Start Web server. if [ -z "$1" -a ! -f /var/run/lighttpd.pid \ diff -r 67528625d306 -r 9e01bc6321ea phpeasyvcs/receipt --- a/phpeasyvcs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/phpeasyvcs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -29,9 +29,9 @@ post_install() { # Configure lighttpd server - if [ -f $1/etc/lighttpd/lighttpd.conf ]; then - if ! grep -q /usr/share/phpeasyvcs/ $1/etc/lighttpd/lighttpd.conf; then - sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/phpeasyvcs/" => "/usr/share/phpeasyvcs/",|g' -i $1/etc/lighttpd/lighttpd.conf + if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then + if ! grep -q /usr/share/phpeasyvcs/ "$1/etc/lighttpd/lighttpd.conf"; then + sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/phpeasyvcs/" => "/usr/share/phpeasyvcs/",|g' -i "$1/etc/lighttpd/lighttpd.conf" if [ -z "$1" ]; then # Start Web server. /etc/init.d/lighttpd stop @@ -40,9 +40,9 @@ fi fi # Configure apache server - if [ -f $1/etc/apache/httpd.conf ]; then - if [ ! -f $1/etc/apache/conf.d/phpeasyvcs ]; then - cat > $1/etc/apache/conf.d/phpeasyvcs < "$1/etc/apache/conf.d/phpeasyvcs" < Alias /phpeasyvcs /usr/share/phpeasyvcs diff -r 67528625d306 -r 9e01bc6321ea phpldapadmin/receipt --- a/phpldapadmin/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/phpldapadmin/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -30,15 +30,15 @@ post_install() { - if [ -s $1/etc/openldap/slapd.conf ]; then - rootdn=$(awk '/^rootdn/ { print $2 }' < $1/etc/openldap/slapd.conf | sed 's/"//g') - sed -i "s|'login','dn','');|'login','dn','');\\n\$ldapservers->SetValue(\$i,'login','dn','$rootdn');|" $1/etc/phpldapadmin/config.php - chown 80.80 $1/etc/phpldapadmin/config.php + if [ -s "$1/etc/openldap/slapd.conf" ]; then + rootdn=$(awk '/^rootdn/ { print $2 }' < "$1/etc/openldap/slapd.conf" | sed 's/"//g') + sed -i "s|'login','dn','');|'login','dn','');\\n\$ldapservers->SetValue(\$i,'login','dn','$rootdn');|" "$1/etc/phpldapadmin/config.php" + chown 80.80 "$1/etc/phpldapadmin/config.php" fi # Configure lighttpd server - if [ -f $1/etc/lighttpd/lighttpd.conf ]; then - if ! grep -q /usr/share/phpldapadmin/ $1/etc/lighttpd/lighttpd.conf; then - sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/phpldapadmin/" => "/usr/share/phpldapadmin/",|g' -i $1/etc/lighttpd/lighttpd.conf + if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then + if ! grep -q /usr/share/phpldapadmin/ "$1/etc/lighttpd/lighttpd.conf"; then + sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/phpldapadmin/" => "/usr/share/phpldapadmin/",|g' -i "$1/etc/lighttpd/lighttpd.conf" if [ -z "$1" ]; then # Start Web server. /etc/init.d/lighttpd stop @@ -47,9 +47,9 @@ fi fi # Configure apache server - if [ -f $1/etc/apache/httpd.conf ]; then - if [ ! -f $1/etc/apache/conf.d/phpldapadmin ]; then - cat > $1/etc/apache/conf.d/phpldapadmin < "$1/etc/apache/conf.d/phpldapadmin" < Alias /phpldapadmin /usr/share/phpldapadmin @@ -71,8 +71,8 @@ cat < /dev/null | md5sum | sed 's/ .*//') sed -i "s/^\(.*blowfish_secret'] = '\)'/\1$secret'/" \ - $1/etc/phpmyadmin/config.inc.php + "$1/etc/phpmyadmin/config.inc.php" # Configure lighttpd server - if [ -f $1/etc/lighttpd/lighttpd.conf ]; then - if ! grep -q /usr/share/phpmyadmin/ $1/etc/lighttpd/lighttpd.conf; then - sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/phpmyadmin/" => "/usr/share/phpmyadmin/",|g' -i $1/etc/lighttpd/lighttpd.conf + if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then + if ! grep -q /usr/share/phpmyadmin/ "$1/etc/lighttpd/lighttpd.conf"; then + sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/phpmyadmin/" => "/usr/share/phpmyadmin/",|g' -i "$1/etc/lighttpd/lighttpd.conf" if [ -z "$1" ]; then # Start Web server. /etc/init.d/lighttpd stop @@ -60,9 +60,9 @@ fi fi # Configure apache server - if [ -f $1/etc/apache/httpd.conf ]; then - if [ ! -f $1/etc/apache/conf.d/phpmyadmin ]; then - cat > $1/etc/apache/conf.d/phpmyadmin < "$1/etc/apache/conf.d/phpmyadmin" < Alias /phpmyadmin /usr/share/phpmyadmin diff -r 67528625d306 -r 9e01bc6321ea phppgadmin/receipt --- a/phppgadmin/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/phppgadmin/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -33,9 +33,9 @@ post_install() { # Configure lighttpd server - if [ -f $1/etc/lighttpd/lighttpd.conf ]; then - if ! grep -q /usr/share/phppgadmin/ $1/etc/lighttpd/lighttpd.conf; then - sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/phppgadmin/" => "/usr/share/phppgadmin/",|g' -i $1/etc/lighttpd/lighttpd.conf + if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then + if ! grep -q /usr/share/phppgadmin/ "$1/etc/lighttpd/lighttpd.conf"; then + sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/phppgadmin/" => "/usr/share/phppgadmin/",|g' -i "$1/etc/lighttpd/lighttpd.conf" if [ -z "$1" ]; then # Start Web server. /etc/init.d/lighttpd stop @@ -44,9 +44,9 @@ fi fi # Configure apache server - if [ -f $1/etc/apache/httpd.conf ]; then - if [ ! -f $1/etc/apache/conf.d/phppgadmin ]; then - cat > $1/etc/apache/conf.d/phppgadmin < "$1/etc/apache/conf.d/phppgadmin" < Alias /phppgadmin /usr/share/phppgadmin diff -r 67528625d306 -r 9e01bc6321ea phproxy/receipt --- a/phproxy/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/phproxy/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -35,9 +35,9 @@ post_install() { # Configure lighttpd server - if [ -f $1/etc/lighttpd/lighttpd.conf ]; then - if ! grep -q /usr/share/phproxy/ $1/etc/lighttpd/lighttpd.conf; then - sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/phproxy/" => "/usr/share/phproxy/",|g' -i $1/etc/lighttpd/lighttpd.conf + if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then + if ! grep -q /usr/share/phproxy/ "$1/etc/lighttpd/lighttpd.conf"; then + sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/phproxy/" => "/usr/share/phproxy/",|g' -i "$1/etc/lighttpd/lighttpd.conf" if [ -z "$1" ]; then # Start Web server. /etc/init.d/lighttpd stop @@ -46,9 +46,9 @@ fi fi # Configure apache server - if [ -f $1/etc/apache/httpd.conf ]; then - if [ ! -f $1/etc/apache/conf.d/phproxy ]; then - cat > $1/etc/apache/conf.d/phproxy < "$1/etc/apache/conf.d/phproxy" < Alias /phproxy /usr/share/phproxy diff -r 67528625d306 -r 9e01bc6321ea phpsysinfo/receipt --- a/phpsysinfo/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/phpsysinfo/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -44,9 +44,9 @@ post_install() { # Configure lighttpd server - if [ -f $1/etc/lighttpd/lighttpd.conf ]; then - if ! grep -q /usr/share/phpsysinfo/ $1/etc/lighttpd/lighttpd.conf; then - sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/phpsysinfo/" => "/usr/share/phpsysinfo/",|g' -i $1/etc/lighttpd/lighttpd.conf + if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then + if ! grep -q /usr/share/phpsysinfo/ "$1/etc/lighttpd/lighttpd.conf"; then + sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/phpsysinfo/" => "/usr/share/phpsysinfo/",|g' -i "$1/etc/lighttpd/lighttpd.conf" if [ -z "$1" ]; then # Start Web server. /etc/init.d/lighttpd stop @@ -55,9 +55,9 @@ fi fi # Configure apache server - if [ -f $1/etc/apache/httpd.conf ]; then - if [ ! -f $1/etc/apache/conf.d/phpsysinfo ]; then - cat > $1/etc/apache/conf.d/phpsysinfo < "$1/etc/apache/conf.d/phpsysinfo" < Alias /phpsysinfo /usr/share/phpsysinfo diff -r 67528625d306 -r 9e01bc6321ea phpvirtualbox/receipt --- a/phpvirtualbox/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/phpvirtualbox/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -26,13 +26,13 @@ post_install() { # Virtualbox OSE needs to disable authenication for vboxwebsrv - [ -d $1/var/lib/tazpkg/installed/virtualbox ] || - chroot $1/ VBoxManage setproperty websrvauthlibrary null + [ -d "$1/var/lib/tazpkg/installed/virtualbox" ] || + chroot "$1/" VBoxManage setproperty websrvauthlibrary null # Configure lighttpd server - if [ -f $1/etc/lighttpd/lighttpd.conf ]; then - if ! grep -q /usr/share/phpvirtualbox/ $1/etc/lighttpd/lighttpd.conf; then - sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/phpvirtualbox/" => "/usr/share/phpvirtualbox/",|g' -i $1/etc/lighttpd/lighttpd.conf + if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then + if ! grep -q /usr/share/phpvirtualbox/ "$1/etc/lighttpd/lighttpd.conf"; then + sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/phpvirtualbox/" => "/usr/share/phpvirtualbox/",|g' -i "$1/etc/lighttpd/lighttpd.conf" if [ -z "$1" ]; then # Start Web server. /etc/init.d/lighttpd stop @@ -41,9 +41,9 @@ fi fi # Configure apache server - if [ -f $1/etc/apache/httpd.conf ]; then - if [ ! -f $1/etc/apache/conf.d/phpvirtualbox ]; then - cat > $1/etc/apache/conf.d/phpvirtualbox < "$1/etc/apache/conf.d/phpvirtualbox" < Alias /phpvirtualbox /usr/share/phpvirtualbox diff -r 67528625d306 -r 9e01bc6321ea pm-utils/receipt --- a/pm-utils/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/pm-utils/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -67,13 +67,13 @@ pre_remove() { - [ -s $1/etc/slim.conf ] && - sed -i 's|.*/usr/sbin/pm-suspend|#&|' $1/etc/slim.conf + [ -s "$1/etc/slim.conf" ] && + sed -i 's|.*/usr/sbin/pm-suspend|#&|' "$1/etc/slim.conf" } post_install() { - [ -s $1/etc/slim.conf ] && + [ -s "$1/etc/slim.conf" ] && sed -i 's|^#suspend_cmd.*|suspend_cmd /usr/sbin/pm-suspend|' \ - $1/etc/slim.conf + "$1/etc/slim.conf" } diff -r 67528625d306 -r 9e01bc6321ea polipo/receipt --- a/polipo/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/polipo/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -35,8 +35,8 @@ post_install() { echo -n "Creating disk cache..." - mkdir $1/var/cache/polipo - chown tux.tux $1/var/cache/polipo + mkdir "$1/var/cache/polipo" + chown tux.tux "$1/var/cache/polipo" status } @@ -44,7 +44,7 @@ post_remove() { echo -n "Removing disk cache..." - rm -rf $1/var/cache/polipo + rm -rf "$1/var/cache/polipo" status } diff -r 67528625d306 -r 9e01bc6321ea postfix/receipt --- a/postfix/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/postfix/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -84,28 +84,28 @@ user=postfix group=postdrop - if ! grep -q $user $1/etc/passwd; then + if ! grep -q $user "$1/etc/passwd"; then echo -n "Adding user/group $user..." - chroot $1/ addgroup -S $user - chroot $1/ adduser -S -D -H -G $user $user - chroot $1/ addgroup -S $group + chroot "$1/" addgroup -S $user + chroot "$1/" adduser -S -D -H -G $user $user + chroot "$1/" addgroup -S $group status fi # addgroup postdrop if needed - if ! grep -q postdrop $1/etc/group; then + if ! grep -q postdrop "$1/etc/group"; then echo -n "Adding group ${group}..." - chroot $1/ addgroup -S $group + chroot "$1/" addgroup -S $group status fi - chroot $1/ chown ${user} /var/spool/postfix/* /var/lib/postfix - chroot $1/ chgrp ${group} /var/spool/postfix/maildrop \ + chroot "$1/" chown ${user} /var/spool/postfix/* /var/lib/postfix + chroot "$1/" chgrp ${group} /var/spool/postfix/maildrop \ /var/spool/postfix/public /usr/sbin/postdrop /usr/sbin/postqueue - chmod 2755 $1/usr/sbin/postdrop $1/usr/sbin/postqueue - chmod 2710 $1/var/spool/postfix/public - chmod 1730 $1/var/spool/postfix/maildrop - chroot $1/ postalias /etc/postfix/aliases + chmod 2755 "$1/usr/sbin/postdrop" "$1/usr/sbin/postqueue" + chmod 2710 "$1/var/spool/postfix/public" + chmod 1730 "$1/var/spool/postfix/maildrop" + chroot "$1/" postalias /etc/postfix/aliases cat < "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/postfixadmin/" => "/usr/share/postfixadmin/",|g' -i $1/etc/lighttpd/lighttpd.conf + if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then + if ! grep -q /usr/share/postfixadmin/ "$1/etc/lighttpd/lighttpd.conf"; then + sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/postfixadmin/" => "/usr/share/postfixadmin/",|g' -i "$1/etc/lighttpd/lighttpd.conf" if [ -z "$1" ]; then # Start Web server. /etc/init.d/lighttpd stop @@ -60,9 +60,9 @@ fi fi # Configure apache server - if [ -f $1/etc/apache/httpd.conf ]; then - if [ ! -f $1/etc/apache/conf.d/postfixadmin ]; then - cat > $1/etc/apache/conf.d/postfixadmin < "$1/etc/apache/conf.d/postfixadmin" < Alias /postfixadmin /usr/share/postfixadmin @@ -82,6 +82,3 @@ fi fi } - - - diff -r 67528625d306 -r 9e01bc6321ea postgresql/receipt --- a/postgresql/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/postgresql/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -56,20 +56,20 @@ post_install() { # adduser postgres if needed - if ! grep -q postgres: $1/etc/passwd; then + if ! grep -q postgres: "$1/etc/passwd"; then echo -n "Adding user postgres..." - chroot $1/ adduser postgres -D -H -u 88 -h /var/lib/pgsql - #[ -d $1/var/lib/pgsql ] && rm -f $1/var/lib/pgsql/.* $1/var/lib/pgsql/* + chroot "$1/" adduser postgres -D -H -u 88 -h /var/lib/pgsql + #[ -d "$1/var/lib/pgsql" ] && rm -f "$1/var/lib/pgsql"/.* "$1/var/lib/pgsql"/* status fi # addgroup postgres if needed - if ! grep -q postgres: $1/etc/group; then + if ! grep -q postgres: "$1/etc/group"; then echo -n "Adding group postgres..." - chroot $1/ sh -c 'addgroup -g 88 postgres' + chroot "$1/" sh -c 'addgroup -g 88 postgres' status fi - [ ! -d $1/var/lib/pgsql ] && mkdir -p $1/var/lib/pgsql - chroot $1/ chown -R postgres.postgres /var/lib/pgsql /var/log/postgresql + [ ! -d "$1/var/lib/pgsql" ] && mkdir -p "$1/var/lib/pgsql" + chroot "$1/" chown -R postgres.postgres /var/lib/pgsql /var/log/postgresql cat <> $1/etc/init.d/rc.shutdown <> "$1/etc/init.d/rc.shutdown" <&1 > /dev/null EOT @@ -42,5 +42,5 @@ post_remove() { - sed -i '/kexec/d' $1/etc/init.d/rc.shutdown + sed -i '/kexec/d' "$1/etc/init.d/rc.shutdown" } diff -r 67528625d306 -r 9e01bc6321ea pybootchartgui/receipt --- a/pybootchartgui/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/pybootchartgui/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -25,22 +25,18 @@ post_install() { - local root - root=$1 - PY_VERSION=`cat /var/lib/tazpkg/installed/python/receipt | grep "VERSION="|cut -d \" -f 2 | cut -d . -f 1,2` - if [ -f $root/usr/bin/pybootchartgui ] ; then rm $root/usr/bin/pybootchartgui ; fi - ln -s $root/usr/lib/python$PY_VERSION/pybootchartgui.py $root/usr/bin/pybootchartgui - if [ -f $root/etc/bootchartd.conf ] ; then - sed -i s/'AUTO_RENDER="no"'/'AUTO_RENDER="yes"'/ $root/etc/bootchartd.conf + PY_VERSION=$(cat "$1/var/lib/tazpkg/installed/python/receipt" | grep "VERSION="|cut -d \" -f 2 | cut -d . -f 1,2) + if [ -f "$1/usr/bin/pybootchartgui" ] ; then rm "$1/usr/bin/pybootchartgui" ; fi + ln -s "$1/usr/lib/python$PY_VERSION/pybootchartgui.py" "$1/usr/bin/pybootchartgui" + if [ -f "$1/etc/bootchartd.conf" ] ; then + sed -i s/'AUTO_RENDER="no"'/'AUTO_RENDER="yes"'/ "$1/etc/bootchartd.conf" fi } post_remove() { - local root - root=$1 - rm $root/usr/bin/pybootchartgui - if [ -f $root/etc/bootchartd.conf ] ; then - sed -i s/'AUTO_RENDER="yes"'/'AUTO_RENDER="no"'/ $root/etc/bootchartd.conf - fi + rm "$1/usr/bin/pybootchartgui" + if [ -f "$1/etc/bootchartd.conf" ] ; then + sed -i s/'AUTO_RENDER="yes"'/'AUTO_RENDER="no"'/ "$1/etc/bootchartd.conf" + fi } diff -r 67528625d306 -r 9e01bc6321ea pyradio/receipt --- a/pyradio/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/pyradio/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -27,6 +27,6 @@ post_install() { # hack for path to stations file - sed -i 's|__file__|"/usr/share/pyradio/"|g' $1/usr/bin/pyradio + sed -i 's|__file__|"/usr/share/pyradio/"|g' "$1/usr/bin/pyradio" } diff -r 67528625d306 -r 9e01bc6321ea python-django/receipt --- a/python-django/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/python-django/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -31,7 +31,7 @@ # Remove old package. post_install() { - [ ! -d $1/var/lib/tazpkg/installed/django ] || - rm -rf $1/var/lib/tazpkg/installed/django + [ ! -d "$1/var/lib/tazpkg/installed/django" ] || + rm -rf "$1/var/lib/tazpkg/installed/django" } diff -r 67528625d306 -r 9e01bc6321ea python-docutils/receipt --- a/python-docutils/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/python-docutils/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -29,6 +29,6 @@ # Remove old package. post_install() { - [ ! -d $1/var/lib/tazpkg/installed/docutils ] || - rm -rf $1/var/lib/tazpkg/installed/docutils + [ ! -d "$1/var/lib/tazpkg/installed/docutils" ] || + rm -rf "$1/var/lib/tazpkg/installed/docutils" } diff -r 67528625d306 -r 9e01bc6321ea python-jinja2/receipt --- a/python-jinja2/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/python-jinja2/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -29,6 +29,6 @@ # Remove old package. post_install() { - [ ! -d $1/var/lib/tazpkg/installed/jinja2 ] || - rm -rf $1/var/lib/tazpkg/installed/jinja2 + [ ! -d "$1/var/lib/tazpkg/installed/jinja2" ] || + rm -rf "$1/var/lib/tazpkg/installed/jinja2" } diff -r 67528625d306 -r 9e01bc6321ea python-mysql/receipt --- a/python-mysql/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/python-mysql/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -32,7 +32,7 @@ # Remove old package. post_install() { - [ ! -d $1/var/lib/tazpkg/installed/mysql-python ] || - rm -rf $1/var/lib/tazpkg/installed/mysql-python + [ ! -d "$1/var/lib/tazpkg/installed/mysql-python" ] || + rm -rf "$1/var/lib/tazpkg/installed/mysql-python" } diff -r 67528625d306 -r 9e01bc6321ea python-numpy/receipt --- a/python-numpy/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/python-numpy/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -32,6 +32,6 @@ # Remove old package. post_install() { - [ ! -d $1/var/lib/tazpkg/installed/numpy ] || - rm -rf $1/var/lib/tazpkg/installed/numpy + [ ! -d "$1/var/lib/tazpkg/installed/numpy" ] || + rm -rf "$1/var/lib/tazpkg/installed/numpy" } diff -r 67528625d306 -r 9e01bc6321ea python-pil/receipt --- a/python-pil/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/python-pil/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -31,6 +31,6 @@ # Remove old package. post_install() { - [ ! -d $1/var/lib/tazpkg/installed/pil ] || - rm -rf $1/var/lib/tazpkg/installed/pil + [ ! -d "$1/var/lib/tazpkg/installed/pil" ] || + rm -rf "$1/var/lib/tazpkg/installed/pil" } diff -r 67528625d306 -r 9e01bc6321ea python-pychart/receipt --- a/python-pychart/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/python-pychart/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -31,7 +31,7 @@ # Remove old package. post_install() { - [ ! -d $1/var/lib/tazpkg/installed/pychart ] || - rm -rf $1/var/lib/tazpkg/installed/pychart + [ ! -d "$1/var/lib/tazpkg/installed/pychart" ] || + rm -rf "$1/var/lib/tazpkg/installed/pychart" } diff -r 67528625d306 -r 9e01bc6321ea python-pydot/receipt --- a/python-pydot/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/python-pydot/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -31,7 +31,7 @@ # Remove old package. post_install() { - [ ! -d $1/var/lib/tazpkg/installed/pydot ] || - rm -rf $1/var/lib/tazpkg/installed/pydot + [ ! -d "$1/var/lib/tazpkg/installed/pydot" ] || + rm -rf "$1/var/lib/tazpkg/installed/pydot" } diff -r 67528625d306 -r 9e01bc6321ea python-pygame/receipt --- a/python-pygame/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/python-pygame/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -40,6 +40,6 @@ # Remove old package. post_install() { - [ ! -d $1/var/lib/tazpkg/installed/pygame/examples ] || - rm -rf $1/var/lib/tazpkg/installed/pygame/examples + [ ! -d "$1/var/lib/tazpkg/installed/pygame/examples" ] || + rm -rf "$1/var/lib/tazpkg/installed/pygame/examples" } diff -r 67528625d306 -r 9e01bc6321ea python-pypdf/receipt --- a/python-pypdf/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/python-pypdf/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -29,6 +29,6 @@ # Remove old package. post_install() { - [ ! -d $1/var/lib/tazpkg/installed/pypdf ] || - rm -rf $1/var/lib/tazpkg/installed/pypdf + [ ! -d "$1/var/lib/tazpkg/installed/pypdf" ] || + rm -rf "$1/var/lib/tazpkg/installed/pypdf" } diff -r 67528625d306 -r 9e01bc6321ea python-pytz/receipt --- a/python-pytz/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/python-pytz/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -31,6 +31,6 @@ # Remove old package. post_install() { - [ ! -d $1/var/lib/tazpkg/installed/pytz ] || - rm -rf $1/var/lib/tazpkg/installed/pytz + [ ! -d "$1/var/lib/tazpkg/installed/pytz" ] || + rm -rf "$1/var/lib/tazpkg/installed/pytz" } diff -r 67528625d306 -r 9e01bc6321ea python-pyxml/receipt --- a/python-pyxml/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/python-pyxml/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -31,6 +31,6 @@ # Remove old package. post_install() { - [ ! -d $1/var/lib/tazpkg/installed/pyxml ] || - rm -rf $1/var/lib/tazpkg/installed/pyxml + [ ! -d "$1/var/lib/tazpkg/installed/pyxml" ] || + rm -rf "$1/var/lib/tazpkg/installed/pyxml" } diff -r 67528625d306 -r 9e01bc6321ea python-reportlab/receipt --- a/python-reportlab/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/python-reportlab/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -37,7 +37,7 @@ # Remove old package. post_install() { - [ ! -d $1/var/lib/tazpkg/installed/reportlab ] || - rm -rf $1/var/lib/tazpkg/installed/reportlab + [ ! -d "$1/var/lib/tazpkg/installed/reportlab" ] || + rm -rf "$1/var/lib/tazpkg/installed/reportlab" } diff -r 67528625d306 -r 9e01bc6321ea python-simplejson/receipt --- a/python-simplejson/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/python-simplejson/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -45,6 +45,6 @@ # Remove old package. post_install() { - [ ! -d $1/var/lib/tazpkg/installed/simplejson ] || - rm -rf $1/var/lib/tazpkg/installed/simplejson + [ ! -d "$1/var/lib/tazpkg/installed/simplejson" ] || + rm -rf "$1/var/lib/tazpkg/installed/simplejson" } diff -r 67528625d306 -r 9e01bc6321ea python-sphinx/receipt --- a/python-sphinx/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/python-sphinx/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -31,6 +31,6 @@ # Remove old package. post_install() { - [ ! -d $1/var/lib/tazpkg/installed/sphinx ] || - rm -rf $1/var/lib/tazpkg/installed/sphinx + [ ! -d "$1/var/lib/tazpkg/installed/sphinx" ] || + rm -rf "$1/var/lib/tazpkg/installed/sphinx" } diff -r 67528625d306 -r 9e01bc6321ea qcad/receipt --- a/qcad/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/qcad/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -51,7 +51,7 @@ post_install() { - cd $1/usr/lib/qcad + cd "$1/usr/lib/qcad" mv -f lib-freetype-.-so-.-6 libfreetype.so.6 } diff -r 67528625d306 -r 9e01bc6321ea razorqt/receipt --- a/razorqt/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/razorqt/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -96,11 +96,11 @@ post_install() { - res=$(cat $1/etc/slim.conf | grep ^session | sed s/"sessions. *"//) + res=$(cat "$1/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/" "$1/etc/slim.conf" status fi true @@ -109,7 +109,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 "$1/etc/slim.conf"; then + sed -i s/,$PACKAGE// "$1/etc/slim.conf" fi } diff -r 67528625d306 -r 9e01bc6321ea remind/receipt --- a/remind/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/remind/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -36,16 +36,16 @@ post_install() { # Check for ~/.reminders file - needed for wyrd - for i in $(ls $1/home 2> /dev/null); do - [ -f $1/home/$i/.reminders ] && continue + for i in $(ls "$1/home" 2> /dev/null); do + [ -f "$1/home/$i/.reminders" ] && continue echo -n "Creating config file for $i ..." - touch $1/home/$i/.reminders - chroot $1/ chown $(stat -c "%u.%g" $1/home/$i) /home/$i/.reminders + touch "$1/home/$i/.reminders" + chroot "$1/" chown $(stat -c "%u.%g" "$1/home/$i") "/home/$i/.reminders" status done } post_remove() { - rm -f $1/home/*/.reminders + rm -f "$1"/home/*/.reminders } diff -r 67528625d306 -r 9e01bc6321ea rox-filer/receipt --- a/rox-filer/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/rox-filer/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -70,14 +70,14 @@ # Check /usr/share/icons/ROX post_install() { - if [ -e $1/usr/share/icons/ROX ]; then + if [ -e "$1/usr/share/icons/ROX" ]; then echo "" echo "/usr/share/icons/ROX exists" else echo "" echo "/usr/share/icons/ROX doesn't exists" echo -n "linking /usr/share/icons/ROX to /usr/share/icons/Tango" - ln -s /usr/share/icons/Tango $1/usr/share/icons/ROX + ln -s /usr/share/icons/Tango "$1/usr/share/icons/ROX" status fi } diff -r 67528625d306 -r 9e01bc6321ea rpm4/receipt --- a/rpm4/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/rpm4/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -78,19 +78,19 @@ pre_remove() { - if [ -d $1/var/lib/rpm ]; then - rm -f $1/var/lib/rpm/* + if [ -d "$1/var/lib/rpm" ]; then + rm -f "$1"/var/lib/rpm/* fi } post_remove() { echo "Processing post remove commands..." - cmd=`readlink $root/bin/rpm` + cmd=$(readlink "$1/bin/rpm") if [ ! "$cmd" = "/bin/rpm" ]; then echo -n "Restore applets from busybox..." - ln -sf $root/bin/busybox $root/bin/rpm - ln -sf $root/bin/busybox $root/usr/bin/rpm2cpio + ln -sf /bin/busybox "$1/bin/rpm" + ln -sf /bin/busybox "$1/usr/bin/rpm2cpio" status fi } diff -r 67528625d306 -r 9e01bc6321ea rsync/receipt --- a/rsync/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/rsync/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -47,12 +47,12 @@ cp -a $stuff/usr $fs chown root.root $fs/etc/init.d/* chmod 0644 $fs/etc/rsyncd.conf - grep -q rsync $1/etc/inetd.conf || cat >> $1/etc/inetd.conf <> "$1/etc/inetd.conf" < $1/proc/sys/fs/binfmt_misc/BOOTBIN - echo -1 > $1/proc/sys/fs/binfmt_misc/DOSCOM - sed -i '/binfmt_misc/{NN;/DOSCOM:E::com/d}' $1/etc/init.d/local.sh + echo -1 > "$1/proc/sys/fs/binfmt_misc/BOOTBIN" + echo -1 > "$1/proc/sys/fs/binfmt_misc/DOSCOM" + sed -i '/binfmt_misc/{NN;/DOSCOM:E::com/d}' "$1/etc/init.d/local.sh" } diff -r 67528625d306 -r 9e01bc6321ea sane-backends/receipt --- a/sane-backends/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/sane-backends/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -64,20 +64,17 @@ post_install() { - local root - root=$1 - - tazpkg reconfigure udev --root=$root + tazpkg reconfigure udev --root="$1" # add group scanner - if ! grep -q scanner $root/etc/group ; then - chroot "$root/" addgroup -g 96 scanner + if ! grep -q scanner "$1/etc/group" ; then + chroot "$1/" addgroup -g 96 scanner fi echo " ADD yourself to group scanner to use sane: addgroup tux scanner" - [ -e $root/var/www/tazpanel/tmp ] || - ln -s /tmp $root/var/www/tazpanel/tmp + [ -e "$1/var/www/tazpanel/tmp" ] || + ln -s /tmp "$1/var/www/tazpanel/tmp" } post_remove() diff -r 67528625d306 -r 9e01bc6321ea shaarli/receipt --- a/shaarli/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/shaarli/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -25,5 +25,5 @@ post_install() { - chown -R www $1/var/www/$PACKAGE + chown -R www "$1/var/www/$PACKAGE" } diff -r 67528625d306 -r 9e01bc6321ea shaarlo/receipt --- a/shaarlo/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/shaarlo/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -28,7 +28,7 @@ post_install() { - chown -R www $1/var/www/$PACKAGE + chown -R www "$1/var/www/$PACKAGE" cat < \"/usr/share/examples/\",| \"/examples/\" => \"/usr/share/examples/\",\\n \"/$PACKAGE/\" => \"/usr/share/$PACKAGE/\",|g" -i $1/etc/lighttpd/lighttpd.conf + if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then + if ! grep -q /usr/share/phpsysinfo/ "$1/etc/lighttpd/lighttpd.conf"; then + sed -e "s|.*\"/examples/\" => \"/usr/share/examples/\",| \"/examples/\" => \"/usr/share/examples/\",\\n \"/$PACKAGE/\" => \"/usr/share/$PACKAGE/\",|g" -i "$1/etc/lighttpd/lighttpd.conf" if [ -z "$1" ]; then # Start Web server. /etc/init.d/lighttpd stop @@ -43,9 +43,9 @@ fi fi # Configure apache server - if [ -f $1/etc/apache/httpd.conf ]; then - if [ ! -f $1/etc/apache/conf.d/$PACKAGE ]; then - cat > $1/etc/apache/conf.d/$PACKAGE < "$1/etc/apache/conf.d/$PACKAGE" < Alias /$PACKAGE /usr/share/$PACKAGE diff -r 67528625d306 -r 9e01bc6321ea silc-server/receipt --- a/silc-server/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/silc-server/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -36,5 +36,5 @@ # Pre and post install commands for Tazpkg. post_install() { - [ -s $1/etc/silcd.pub ] || chroot $1/ /usr/sbin/silcd -C /etc + [ -s "$1/etc/silcd.pub" ] || chroot "$1/" /usr/sbin/silcd -C /etc } diff -r 67528625d306 -r 9e01bc6321ea slib/receipt --- a/slib/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/slib/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -39,7 +39,7 @@ { # add path to initialization file sed -i s'#(load-from.*#(load-from-path "/usr/share/slib/guile.init")#' \ - $1/usr/share/guile/1.8/ice-9/slib.scm + "$1/usr/share/guile/1.8/ice-9/slib.scm" printf "Creating catalog" chroot "$1/" guile -c "((use-modules (ice-9 slib))(require 'new-catalog)(quit))" status @@ -47,5 +47,5 @@ post_remove() { - rm -f $1/usr/share/guile/1.8/slibcat + rm -f "$1/usr/share/guile/1.8/slibcat" } diff -r 67528625d306 -r 9e01bc6321ea slim-pam/receipt --- a/slim-pam/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/slim-pam/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -52,9 +52,9 @@ post_install() { local USER - USER=$(awk -F: '/:1000:1000:/ { print $1 }' < $1/etc/passwd) + USER=$(awk -F: '/:1000:1000:/ { print $1 }' < "$1/etc/passwd") [ -n "$USER" ] && - sed -i s/"default_user .*"/"default_user $USER"/ $1/etc/slim.conf + sed -i s/"default_user .*"/"default_user $USER"/ "$1/etc/slim.conf" # In order to update the SLiM, we need to restart it. # We can't just "/etc/init.d/slim restart" because it momentarily interrupts diff -r 67528625d306 -r 9e01bc6321ea slim/receipt --- a/slim/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/slim/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -63,8 +63,8 @@ post_install() { local USER - USER=$(awk -F: '/:1000:1000:/ { print $1 }' < $1/etc/passwd) + USER=$(awk -F: '/:1000:1000:/ { print $1 }' < "$1/etc/passwd") [ -n "$USER" ] && - sed -i s/"default_user .*"/"default_user $USER"/ $1/etc/slim.conf - sed -i 's|>/tmp/X-output||' $1/etc/slim.conf + sed -i s/"default_user .*"/"default_user $USER"/ "$1/etc/slim.conf" + sed -i 's|>/tmp/X-output||' "$1/etc/slim.conf" } diff -r 67528625d306 -r 9e01bc6321ea slitaz-boot-scripts/receipt --- a/slitaz-boot-scripts/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/slitaz-boot-scripts/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -56,7 +56,7 @@ case "$SLITAZ_ARCH" in i?86) echo - chroot $1/ /usr/bin/rcSconf up ;; + chroot "$1/" /usr/bin/rcSconf up ;; arm) if [ ! -d "/var/lib/tazpkg/installed/slitaz-arm-configs" ]; then spk-add slitaz-arm-configs diff -r 67528625d306 -r 9e01bc6321ea slitaz-configs-base/receipt --- a/slitaz-configs-base/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/slitaz-configs-base/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -59,8 +59,8 @@ post_install() { echo; echo -n "Updating ~/.xinitrc" - for i in $(ls -d $1/root $1/home/* 2> /dev/null); do - [ -d $i ] && cp -f $1/etc/skel/.xinitrc $i + for i in $(ls -d "$1/root" "$1"/home/* 2> /dev/null); do + [ -d "$i" ] && cp -f "$1/etc/skel/.xinitrc" "$i" done - sed -i 's|$HOME/.config|/etc|' $1/root/.xinitrc + sed -i 's|$HOME/.config|/etc|' "$1/root/.xinitrc" } diff -r 67528625d306 -r 9e01bc6321ea slitaz-configs/receipt --- a/slitaz-configs/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/slitaz-configs/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -76,9 +76,9 @@ # By default slim provide a base theme and config file have both # base and slitaz who will be choose randomly, so make sure we use # only slitaz theme. - if grep -q 'current_theme slitaz,base' $1/etc/slim.conf; then + if grep -q 'current_theme slitaz,base' "$1/etc/slim.conf"; then sed -i s/"current_theme .*"/"current_theme slitaz"/ \ - $1/etc/slim.conf + "$1/etc/slim.conf" fi ;; esac } diff -r 67528625d306 -r 9e01bc6321ea slitaz-eeepc/receipt --- a/slitaz-eeepc/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/slitaz-eeepc/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -35,11 +35,11 @@ pre_install() { - . $1/etc/rcS.conf - sed -i s/'RUN_SCRIPTS="'/'RUN_SCRIPTS="eeepc.sh '/ $1/etc/rcS.conf + . "$1/etc/rcS.conf" + sed -i s/'RUN_SCRIPTS="'/'RUN_SCRIPTS="eeepc.sh '/ "$1/etc/rcS.conf" # Load module ac and battery sed -i s/"LOAD_MODULES=\"$LOAD_MODULES\""/"LOAD_MODULES=\"$LOAD_MODULES ac battery\""/ \ - $1/etc/rcS.conf + "$1/etc/rcS.conf" } pre_remove() diff -r 67528625d306 -r 9e01bc6321ea slitaz-icon/receipt --- a/slitaz-icon/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/slitaz-icon/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -43,10 +43,10 @@ post_install() { # Default icon theme to SliTaz. - if [ -f $1/etc/skel/.gtkrc-2.0 ]; then - sed -i s/Tango/SliTaz/ $1/etc/skel/.gtkrc-2.0 + if [ -f "$1/etc/skel/.gtkrc-2.0" ]; then + sed -i s/Tango/SliTaz/ "$1/etc/skel/.gtkrc-2.0" fi - if readlink $1/usr/share/icons/Tango; then - rm $1/usr/share/icons/Tango + if readlink "$1/usr/share/icons/Tango"; then + rm "$1/usr/share/icons/Tango" fi } diff -r 67528625d306 -r 9e01bc6321ea slitaz-tango-icon/receipt --- a/slitaz-tango-icon/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/slitaz-tango-icon/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -22,10 +22,10 @@ post_install() { - sed '/Inherits=/s|=.*$|=Tango|' -i $1/$qtfix + sed '/Inherits=/s|=.*$|=Tango|' -i "$1/$qtfix" } pre_remove() { - sed '/Inherits=/s|=.*$|=SliTaz|' -i $1/$qtfix + sed '/Inherits=/s|=.*$|=SliTaz|' -i "$1/$qtfix" } diff -r 67528625d306 -r 9e01bc6321ea smbwebclient/receipt --- a/smbwebclient/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/smbwebclient/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -30,15 +30,15 @@ post_install() { - if [ -f $1/etc/locale.conf ]; then - lang=$(. /etc/locale.conf; echo ${LANG%_*}) + if [ -f "$1/etc/locale.conf" ]; then + lang=$(. "$1/etc/locale.conf"; echo ${LANG%_*}) sed -i "s/DefaultLanguage = 'us'/DefaultLanguage = '$lang'/" \ - $1/etc/samba/smbwebclient.conf + "$1/etc/samba/smbwebclient.conf" fi - if [ -f $1/etc/lighttpd/lighttpd.conf ]; then - if ! grep -q /usr/share/samba/ $1/etc/lighttpd/lighttpd.conf; then - sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/smbwebclient/" => "/usr/share/samba/",|g' -i $1/etc/lighttpd/lighttpd.conf + if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then + if ! grep -q /usr/share/samba/ "$1/etc/lighttpd/lighttpd.conf"; then + sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/smbwebclient/" => "/usr/share/samba/",|g' -i "$1/etc/lighttpd/lighttpd.conf" if [ -z "$1" ]; then # Start Web server. /etc/init.d/lighttpd stop @@ -47,9 +47,9 @@ fi fi # Configure apache server - if [ -f $1/etc/apache/httpd.conf ]; then - if [ ! -f $1/etc/apache/conf.d/smbwebclient ]; then - cat > $1/etc/apache/conf.d/smbwebclient < "$1/etc/apache/conf.d/smbwebclient" < Alias /smbwebclient /usr/share/samba diff -r 67528625d306 -r 9e01bc6321ea snort-mysql/receipt --- a/snort-mysql/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/snort-mysql/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -57,22 +57,22 @@ echo "Processing post install commands..." # addgroup snort if needed - if ! grep -q snort $1/etc/group; then + if ! grep -q snort "$1/etc/group"; then echo -n "Adding group Snort..." - chroot $1/ /bin/addgroup snort + chroot "$1/" /bin/addgroup snort status fi # adduser snort if needed - if ! grep -q 'snort:' $1/etc/passwd; then + if ! grep -q 'snort:' "$1/etc/passwd"; then echo -n "Adding user Snort..." - chroot $1/ /bin/adduser -s /bin/false -h /dev/null \ + chroot "$1/" /bin/adduser -s /bin/false -h /dev/null \ -g "Snort Daemon user" -H -D -S -G snort snort status fi - chroot $1/ chown snort.snort /var/log/snort + chroot "$1/" chown snort.snort /var/log/snort # Create database - if [ -z $1 ]; then + if [ -z "$1" ]; then if ( ! mysqladmin -s ping > /dev/null ); then echo "Starting MySQL server" ( /etc/init.d/mysql start ; status ) || exit @@ -93,6 +93,4 @@ fi fi - - } diff -r 67528625d306 -r 9e01bc6321ea squid/receipt --- a/squid/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squid/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -100,23 +100,22 @@ # Pre and post install commands for Tazpkg. post_install() { - local root local user local group user=squid group=squid - if ! grep -q $user $1/etc/passwd; then + if ! grep -q $user "$1/etc/passwd"; then echo -n "Adding user/group $user..." - chroot $1/ addgroup -S $group - chroot $1/ adduser -S -D -H -G $group $user + chroot "$1/" addgroup -S $group + chroot "$1/" adduser -S -D -H -G $group $user status fi # Set perms for files and directories - chroot $1/ chown -R ${user}.${group} /var/log/squid \ + chroot "$1/" chown -R ${user}.${group} /var/log/squid \ /var/cache/squid cat <> $1/etc/c-icap/c-icap.conf - if ( ps | grep -q squid ); then + echo 'Service squidclamav squidclamav.so' >> "$1/etc/c-icap/c-icap.conf" + [ "$1" ] || if ( ps | grep -q squid ); then /etc/init.d/squid restart fi } @@ -61,11 +61,11 @@ #Post remove command post_remove() { - sed -i -e "s/.*squidclamav.*//" $1/etc/c-icap/c-icap.conf - if ( ps | grep -q squid ); then + sed -i -e "s/.*squidclamav.*//" "$1/etc/c-icap/c-icap.conf" + [ "$1" ] || if ( ps | grep -q squid ); then /etc/init.d/squid restart fi - if ( ps | grep -q c-icap ); then + [ "$1" ] || if ( ps | grep -q c-icap ); then /etc/init.d/c-icapd restart fi } diff -r 67528625d306 -r 9e01bc6321ea squidguard/receipt --- a/squidguard/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squidguard/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -65,15 +65,15 @@ # Pre and post install commands for Tazpkg. post_install() { - chown -R nobody $1/var/lib/squidGuard/* + chown -R nobody "$1"/var/lib/squidGuard/* # Recharge squid config - [ -x $(which squid) ] && $(which squid) -k reconfigure 2> /dev/null + [ -z "$1" ] && [ -x $(which squid) ] && $(which squid) -k reconfigure 2> /dev/null } post_remove() { # Recharge squid config - [ -x $(which squid) ] && $(which squid) -k reconfigure 2> /dev/null + [ -z "$1" ] && [ -x $(which squid) ] && $(which squid) -k reconfigure 2> /dev/null } check_config() diff -r 67528625d306 -r 9e01bc6321ea squidguardmgr/receipt --- a/squidguardmgr/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squidguardmgr/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -44,14 +44,14 @@ post_install() { # squidguardmgr config - chown root.www $1/etc/squidGuard/squidGuard.conf - chmod 664 $1/etc/squidGuard/squidGuard.conf - chown nobody.nogroup $1/usr/share/squidguardmgr/lang/* \ - $1/usr/share/squidguardmgr/lang $1/usr/share/squidguardmgr + chown root.www "$1/etc/squidGuard/squidGuard.conf" + chmod 664 "$1/etc/squidGuard/squidGuard.conf" + chown nobody.nogroup "$1"/usr/share/squidguardmgr/lang/* \ + "$1/usr/share/squidguardmgr/lang" "$1/usr/share/squidguardmgr" # Configure lighttpd server - if [ -f $1/etc/lighttpd/lighttpd.conf ]; then - if ! grep -q /usr/share/squidguardmgr/ $1/etc/lighttpd/lighttpd.conf; then - sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/squidguardmgr/" => "/usr/share/squidguardmgr/",|g' -i $1/etc/lighttpd/lighttpd.conf + if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then + if ! grep -q /usr/share/squidguardmgr/ "$1/etc/lighttpd/lighttpd.conf"; then + sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/squidguardmgr/" => "/usr/share/squidguardmgr/",|g' -i "$1/etc/lighttpd/lighttpd.conf" if [ -z "$1" ]; then # Start Web server. /etc/init.d/lighttpd stop @@ -60,9 +60,9 @@ fi fi # Configure apache server - if [ -f $1/etc/apache/httpd.conf ]; then - if [ ! -f $1/etc/apache/conf.d/squidguardmgr ]; then - cat > $1/etc/apache/conf.d/squidguardmgr < "$1/etc/apache/conf.d/squidguardmgr" < Alias /squidguardmgr /usr/share/squidguardmgr diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-ar/receipt --- a/squirrelmail-ar/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-ar/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-archive/receipt --- a/squirrelmail-archive/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-archive/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -30,7 +30,7 @@ post_install() { - echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php + echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php" } pre_remove() diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-autocomplete/receipt --- a/squirrelmail-autocomplete/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-autocomplete/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -31,7 +31,7 @@ post_install() { - echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php + echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php" } pre_remove() diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-autorespond/receipt --- a/squirrelmail-autorespond/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-autorespond/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -35,7 +35,7 @@ post_install() { - echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php + echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php" } pre_remove() diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-bg_BG/receipt --- a/squirrelmail-bg_BG/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-bg_BG/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-bn_IN/receipt --- a/squirrelmail-bn_IN/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-bn_IN/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-bookmarks/receipt --- a/squirrelmail-bookmarks/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-bookmarks/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -36,7 +36,7 @@ post_install() { - echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php + echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php" } pre_remove() diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-ca_ES/receipt --- a/squirrelmail-ca_ES/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-ca_ES/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-calendard-file-backend/receipt --- a/squirrelmail-calendard-file-backend/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-calendard-file-backend/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -31,7 +31,7 @@ post_install() { - echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php + echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php" } pre_remove() diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-calendard-sql-backend/receipt --- a/squirrelmail-calendard-sql-backend/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-calendard-sql-backend/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -36,7 +36,7 @@ post_install() { - echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php + echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php" } pre_remove() diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-compatibility-plugin/receipt --- a/squirrelmail-compatibility-plugin/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-compatibility-plugin/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -32,7 +32,7 @@ { local file local line - file=$1/usr/share/squirrelmail/functions/strings.php + file="$1/usr/share/squirrelmail/functions/strings.php" line="include_once(SM_PATH . 'plugins/compatibility/functions.php');" - grep -qs "$line" $file || sed -i "s|.*global.php.*|&\n$line|" $file + grep -qs "$line" "$file" || sed -i "s|.*global.php.*|&\n$line|" "$file" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-cs_CZ/receipt --- a/squirrelmail-cs_CZ/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-cs_CZ/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-cy_GB/receipt --- a/squirrelmail-cy_GB/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-cy_GB/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-da_DK/receipt --- a/squirrelmail-da_DK/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-da_DK/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-de_DE/receipt --- a/squirrelmail-de_DE/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-de_DE/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-el_GR/receipt --- a/squirrelmail-el_GR/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-el_GR/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-en_GB/receipt --- a/squirrelmail-en_GB/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-en_GB/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-es_ES/receipt --- a/squirrelmail-es_ES/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-es_ES/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-et_EE/receipt --- a/squirrelmail-et_EE/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-et_EE/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-eu_ES/receipt --- a/squirrelmail-eu_ES/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-eu_ES/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-fa_IR/receipt --- a/squirrelmail-fa_IR/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-fa_IR/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-fi_FI/receipt --- a/squirrelmail-fi_FI/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-fi_FI/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-fo_FO/receipt --- a/squirrelmail-fo_FO/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-fo_FO/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-fr_FR/receipt --- a/squirrelmail-fr_FR/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-fr_FR/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-fy/receipt --- a/squirrelmail-fy/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-fy/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-he_IL/receipt --- a/squirrelmail-he_IL/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-he_IL/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-hr_HR/receipt --- a/squirrelmail-hr_HR/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-hr_HR/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-html/receipt --- a/squirrelmail-html/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-html/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -31,7 +31,7 @@ post_install() { - echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php + echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php" } pre_remove() diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-html_mail/receipt --- a/squirrelmail-html_mail/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-html_mail/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -42,7 +42,7 @@ post_install() { - echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php + echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php" } pre_remove() diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-hu_HU/receipt --- a/squirrelmail-hu_HU/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-hu_HU/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-id_ID/receipt --- a/squirrelmail-id_ID/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-id_ID/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-is_IS/receipt --- a/squirrelmail-is_IS/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-is_IS/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-it_IT/receipt --- a/squirrelmail-it_IT/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-it_IT/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-ja_JP/receipt --- a/squirrelmail-ja_JP/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-ja_JP/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-ka/receipt --- a/squirrelmail-ka/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-ka/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-ko_KR/receipt --- a/squirrelmail-ko_KR/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-ko_KR/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-ldapuser/receipt --- a/squirrelmail-ldapuser/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-ldapuser/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -35,12 +35,12 @@ post_install() { - echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php - mv $1/usr/share/squirrelmail/functions/file_prefs.php \ - $1/usr/share/squirrelmail/functions/file_prefs.php.original + echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php" + mv "$1/usr/share/squirrelmail/functions/file_prefs.php" \ + "$1/usr/share/squirrelmail/functions/file_prefs.php.original" ln -s ../plugins/ldapuserdata/file_prefs.php \ - $1/usr/share/squirrelmail/functions/file_prefs.php - cat >> $1/etc/openldap/slapd.conf <> "$1/etc/openldap/slapd.conf" <> $1/etc/squirrelmail/config_local.php + echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php" } pre_remove() diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-lt_LT/receipt --- a/squirrelmail-lt_LT/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-lt_LT/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-ms_MY/receipt --- a/squirrelmail-ms_MY/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-ms_MY/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-msg_flags/receipt --- a/squirrelmail-msg_flags/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-msg_flags/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -30,10 +30,10 @@ post_install() { - ( cd $1/usr/share/squirrelmail/plugins/$SOURCE - patch -p0 < patches/$SOURCE-squirrelmail-$(. $1/$INSTALLED/squirrelmail/receipt; echo $VERSION).diff ) - echo "$PACKAGE" >> $1/$INSTALLED/squirrelmail/modifiers - echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php + ( cd "$1/usr/share/squirrelmail/plugins/$SOURCE" + patch -p0 < patches/$SOURCE-squirrelmail-$(. "$1/$INSTALLED/squirrelmail/receipt"; echo $VERSION).diff ) + echo "$PACKAGE" >> "$1/$INSTALLED/squirrelmail/modifiers" + echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php" } pre_remove() diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-multilogin/receipt --- a/squirrelmail-multilogin/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-multilogin/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -37,11 +37,11 @@ post_install() { - chown www $1/var/lib/squirrelmail/slitaz.org/data - ( cd $1/usr/share/squirrelmail/plugins/$SOURCE - patch -p0 < patches/$SOURCE-squirrelmail-$(. $1/$INSTALLED/squirrelmail/receipt; echo $VERSION).diff ) - echo "$PACKAGE" >> $1/$INSTALLED/squirrelmail/modifiers - echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php + chown www "$1/var/lib/squirrelmail/slitaz.org/data" + ( cd "$1/usr/share/squirrelmail/plugins/$SOURCE" + patch -p0 < patches/$SOURCE-squirrelmail-$(. "$1/$INSTALLED/squirrelmail/receipt"; echo $VERSION).diff ) + echo "$PACKAGE" >> "$1/$INSTALLED/squirrelmail/modifiers" + echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php" } pre_remove() diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-nb_NO/receipt --- a/squirrelmail-nb_NO/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-nb_NO/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-nl_NL/receipt --- a/squirrelmail-nl_NL/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-nl_NL/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-nn_NO/receipt --- a/squirrelmail-nn_NO/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-nn_NO/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-notes/receipt --- a/squirrelmail-notes/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-notes/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -35,7 +35,7 @@ post_install() { - echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php + echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php" } pre_remove() diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-pl_PL/receipt --- a/squirrelmail-pl_PL/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-pl_PL/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-pt_BR/receipt --- a/squirrelmail-pt_BR/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-pt_BR/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-pt_PT/receipt --- a/squirrelmail-pt_PT/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-pt_PT/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-quota/receipt --- a/squirrelmail-quota/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-quota/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -37,7 +37,7 @@ post_install() { - echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php + echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php" } pre_remove() diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-ro_RO/receipt --- a/squirrelmail-ro_RO/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-ro_RO/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-ru_RU/receipt --- a/squirrelmail-ru_RU/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-ru_RU/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-shared_calendars/receipt --- a/squirrelmail-shared_calendars/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-shared_calendars/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -35,7 +35,7 @@ post_install() { - echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php + echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php" } pre_remove() diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-sieve/receipt --- a/squirrelmail-sieve/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-sieve/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -35,7 +35,7 @@ post_install() { - echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php + echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php" } pre_remove() diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-sizes/receipt --- a/squirrelmail-sizes/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-sizes/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -30,7 +30,7 @@ post_install() { - echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php + echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php" } pre_remove() diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-sk_SK/receipt --- a/squirrelmail-sk_SK/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-sk_SK/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-sl_SI/receipt --- a/squirrelmail-sl_SI/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-sl_SI/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-smallcal/receipt --- a/squirrelmail-smallcal/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-smallcal/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -30,7 +30,7 @@ post_install() { - echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php + echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php" cat < Display Preferences EOF diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-spamassassin/receipt --- a/squirrelmail-spamassassin/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-spamassassin/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -31,7 +31,7 @@ post_install() { - echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php + echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php" } pre_remove() diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-sr_YU/receipt --- a/squirrelmail-sr_YU/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-sr_YU/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-sv_SE/receipt --- a/squirrelmail-sv_SE/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-sv_SE/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-tr_TR/receipt --- a/squirrelmail-tr_TR/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-tr_TR/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-ug/receipt --- a/squirrelmail-ug/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-ug/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-uk_UA/receipt --- a/squirrelmail-uk_UA/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-uk_UA/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-vkeyboard/receipt --- a/squirrelmail-vkeyboard/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-vkeyboard/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -35,7 +35,7 @@ post_install() { - echo "\$plugins[] = '$SOURCE';" >> $1/etc/squirrelmail/config_local.php + echo "\$plugins[] = '$SOURCE';" >> "$1/etc/squirrelmail/config_local.php" } pre_remove() diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-zh_CN/receipt --- a/squirrelmail-zh_CN/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-zh_CN/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail-zh_TW/receipt --- a/squirrelmail-zh_TW/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail-zh_TW/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" $1/etc/squirrelmail/config.php + sed -i "s/^\$squirrelmail_default_language = .*/\$squirrelmail_default_language = '${PACKAGE#squirrelmail-}';/" "$1/etc/squirrelmail/config.php" } diff -r 67528625d306 -r 9e01bc6321ea squirrelmail/receipt --- a/squirrelmail/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/squirrelmail/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -51,9 +51,9 @@ { #echo "Update /short_open_tag in /etc/php.ini" #sed -i 's/^short_open_tag.*/short_open_tag = On/' /etc/php.ini - if [ -f $1/etc/lighttpd/lighttpd.conf ]; then - if ! grep -q /usr/share/squirrelmail/ $1/etc/lighttpd/lighttpd.conf; then - sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/squirrelmail/" => "/usr/share/squirrelmail/",|g' -i $1/etc/lighttpd/lighttpd.conf + if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then + if ! grep -q /usr/share/squirrelmail/ "$1/etc/lighttpd/lighttpd.conf"; then + sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/squirrelmail/" => "/usr/share/squirrelmail/",|g' -i "$1/etc/lighttpd/lighttpd.conf" if [ -z "$1" ]; then # Start Web server. /etc/init.d/lighttpd stop @@ -62,9 +62,9 @@ fi fi # Configure apache server - if [ -f $1/etc/apache/httpd.conf ]; then - if [ ! -f $1/etc/apache/conf.d/squirrelmail ]; then - cat > $1/etc/apache/conf.d/squirrelmail < "$1/etc/apache/conf.d/squirrelmail" < Alias /squirrelmail /usr/share/squirrelmail diff -r 67528625d306 -r 9e01bc6321ea ssmtp/receipt --- a/ssmtp/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/ssmtp/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -43,18 +43,16 @@ post_install() { - local root - root=$1 echo "Processing post-install commands..." - ln -sf /usr/sbin/ssmtp $root/usr/sbin/sendmail - ln -sf /usr/sbin/ssmtp $root/usr/sbin/newaliases - ln -sf /usr/sbin/ssmtp $root/usr/sbin/mailq + ln -sf /usr/sbin/ssmtp "$1/usr/sbin/sendmail" + ln -sf /usr/sbin/ssmtp "$1/usr/sbin/newaliases" + ln -sf /usr/sbin/ssmtp "$1/usr/sbin/mailq" } post_remove() { echo "Processing post-remove commands..." - rm -f $1/usr/sbin/sendmail - rm -f $1/usr/sbin/newaliases - rm -f $1/usr/sbin/mailq + rm -f "$1/usr/sbin/sendmail" + rm -f "$1/usr/sbin/newaliases" + rm -f "$1/usr/sbin/mailq" } diff -r 67528625d306 -r 9e01bc6321ea st/receipt --- a/st/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/st/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -31,5 +31,5 @@ post_install() { - chroot $1/ tic -s /usr/share/${PACKAGE}/st.info + chroot "$1/" tic -s /usr/share/${PACKAGE}/st.info } diff -r 67528625d306 -r 9e01bc6321ea sudo-pam/receipt --- a/sudo-pam/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/sudo-pam/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -42,25 +42,21 @@ pre_install() { - local root - root=$1 echo "Processing pre-install commands..." - if [ -f $root/etc/sudoers.bak ]; then - cp $root/etc/sudoers $root/etc/sudoers.bak + if [ -f "$1/etc/sudoers.bak" ]; then + cp "$1/etc/sudoers" "$1/etc/sudoers.bak" fi } post_install() { - local root - root=$1 echo "Processing post-install commands..." - if [ -f $root/etc/sudoers.bak ]; then - rm -f $root/etc/sudoers - mv $root/etc/sudoers.bak $root/etc/sudoers + if [ -f "$1/etc/sudoers.bak" ]; then + rm -f "$1/etc/sudoers" + mv "$1/etc/sudoers.bak" "$1/etc/sudoers" else - chown root.root $root/etc/sudoers - chmod 0440 $root/etc/sudoers + chown root.root "$1/etc/sudoers" + chmod 0440 "$1/etc/sudoers" fi } diff -r 67528625d306 -r 9e01bc6321ea sudo/receipt --- a/sudo/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/sudo/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -39,21 +39,19 @@ pre_install() { echo "Processing pre-install commands..." - if [ -f $root/etc/sudoers.bak ]; then - cp $root/etc/sudoers $root/etc/sudoers.bak + if [ -f "$1/etc/sudoers.bak" ]; then + cp "$1/etc/sudoers" "$1/etc/sudoers.bak" fi } post_install() { - local root - root=$1 echo "Processing post-install commands..." - if [ -f $root/etc/sudoers.bak ]; then - mv $root/etc/sudoers $root/etc/sudoers-dist - mv $root/etc/sudoers.bak $root/etc/sudoers + if [ -f "$1/etc/sudoers.bak" ]; then + mv "$1/etc/sudoers" "$1/etc/sudoers-dist" + mv "$1/etc/sudoers.bak" "$1/etc/sudoers" else - chown root.root $root/etc/sudoers - chmod 0440 $root/etc/sudoers + chown root.root "$1/etc/sudoers" + chmod 0440 "$1/etc/sudoers" fi } diff -r 67528625d306 -r 9e01bc6321ea swat/receipt --- a/swat/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/swat/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -20,9 +20,9 @@ post_install() { - if [ -f $1/etc/lighttpd/lighttpd.conf ]; then - if ! grep -q /usr/share/samba/swat/ $1/etc/lighttpd/lighttpd.conf; then - sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/swat/" => "/usr/share/samba/swat/",|g' -i $1/etc/lighttpd/lighttpd.conf + if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then + if ! grep -q /usr/share/samba/swat/ "$1/etc/lighttpd/lighttpd.conf"; then + sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/swat/" => "/usr/share/samba/swat/",|g' -i "$1/etc/lighttpd/lighttpd.conf" if [ -z "$1" ]; then # Start Web server. /etc/init.d/lighttpd stop diff -r 67528625d306 -r 9e01bc6321ea t2/receipt --- a/t2/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/t2/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -22,7 +22,7 @@ # Pre and post install commands for Tazpkg. post_install() { - [ -L $1/usr/bin/wget ] && tazpkg get-install wget --forced --root=${1:-/} + [ -L "$1/usr/bin/wget" ] && tazpkg get-install wget --forced --root="${1:-/}" cat < /dev/null || true + rm -f "$1"/var/cache/tazpanel/* 2> /dev/null || true } diff -r 67528625d306 -r 9e01bc6321ea tazpanel-theme-sandfive/receipt --- a/tazpanel-theme-sandfive/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/tazpanel-theme-sandfive/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -26,10 +26,10 @@ # Pre and post install commands for Tazpkg. post_install() { - sed -i 's|STYLE=".*"|STYLE="sandfive"|' $1/etc/slitaz/tazpanel.conf + sed -i 's|STYLE=".*"|STYLE="sandfive"|' "$1/etc/slitaz/tazpanel.conf" } pre_remove() { - sed -i 's|STYLE=".*"|STYLE="default"|' $1/etc/slitaz/tazpanel.conf + sed -i 's|STYLE=".*"|STYLE="default"|' "$1/etc/slitaz/tazpanel.conf" } diff -r 67528625d306 -r 9e01bc6321ea tazpanel/receipt --- a/tazpanel/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/tazpanel/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -34,9 +34,9 @@ # Pre and post install commands for Tazpkg. post_install() { - rm -f $1/var/cache/tazpanel/* 2> /dev/null - grep -qs tazpanel $1/etc/hosts || - sed -i 's/^127.0.0.1.*/& tazpanel/' $1/etc/hosts + rm -f "$1"/var/cache/tazpanel/* 2> /dev/null + grep -qs tazpanel "$1"/etc/hosts || + sed -i 's/^127.0.0.1.*/& tazpanel/' "$1"/etc/hosts # Do we need TazPanel restart? It freezes when updating using web interface. #[ -z "$1" ] && tazpanel restart diff -r 67528625d306 -r 9e01bc6321ea tazwikiss/receipt --- a/tazwikiss/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/tazwikiss/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -33,15 +33,15 @@ { server=busybox # Configure lighttpd server - if [ -f $1/etc/lighttpd/lighttpd.conf ]; then + if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then server=lighttpd - if ! grep -q '"/wiki/"' $1/etc/lighttpd/lighttpd.conf; then + if ! grep -q '"/wiki/"' "$1/etc/lighttpd/lighttpd.conf"; then sed -e 's|# Fast CGI|$HTTP["url"] =~ "/wiki/" {\ cgi.assign = (\ ".sh" => "/bin/sh"\ )\ index-file.names = ( "index.sh" )\ -}\n\n&|' -i $1/etc/lighttpd/lighttpd.conf +}\n\n&|' -i "$1/etc/lighttpd/lighttpd.conf" if [ -z "$1" ]; then # Start Web server. /etc/init.d/lighttpd stop @@ -50,10 +50,10 @@ fi fi # Configure apache server - if [ -f $1/etc/apache/httpd.conf ]; then + if [ -f "$1/etc/apache/httpd.conf" ]; then server=apache - if [ ! -f $1/etc/apache/conf.d/tazwikiss ]; then - cat > $1/etc/apache/conf.d/tazwikiss < "$1/etc/apache/conf.d/tazwikiss" < Options +ExecCGI AddHandler cgi-script .sh @@ -73,9 +73,9 @@ fi # Configure busybox/httpd server by default if [ "$server" == "busybox" ]; then - sed -i 's/lighttpd/httpd/' $1/etc/rcS.conf - if [ ! -s $1/etc/httpd.conf ]; then - cat > $1/etc/httpd.conf < "$1/etc/httpd.conf" <> $1/etc/httpd.conf + grep -q "$line" "$1/etc/httpd.conf" && continue + echo "$line" >> "$1/etc/httpd.conf" done < /dev/null); do - [ -f /home/$i/.tiptoprc ] && continue - cp $1/etc/skel/.tiptoprc $1/home/$i - chroot $1/ chown $(stat -c "%u.%g" $1/home/$i) /home/$i/.tiptoprc + for i in $(ls "$1/home" 2> /dev/null); do + [ -f "/home/$i/.tiptoprc" ] && continue + cp "$1/etc/skel/.tiptoprc" "$1/home/$i" + chroot "$1/" chown $(stat -c "%u.%g" "$1/home/$i") "/home/$i/.tiptoprc" done } post_remove() { - rm -f $1/home/*/.tiptoprc + rm -f "$1"/home/*/.tiptoprc } diff -r 67528625d306 -r 9e01bc6321ea tmux-mem-cpu-load/receipt --- a/tmux-mem-cpu-load/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/tmux-mem-cpu-load/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -35,11 +35,11 @@ post_install() { - for i in $(ls $1/home 2> /dev/null); do - grep -qs "tmux-mem-cpu-load" /home/$i/.tmux.conf && continue + for i in $(ls "$1/home" 2> /dev/null); do + grep -qs "tmux-mem-cpu-load" "/home/$i/.tmux.conf" && continue echo -n "Checking for .tmux.conf for $i ..." - cp -a $1/etc/skel/.tmux.conf /home/$i/ - chroot $1/ chown $(stat -c "%u.%g" $1/home/$i) /home/$i/.tmux.conf + cp -a "$1/etc/skel/.tmux.conf" "/home/$i/" + chroot "$1/" chown $(stat -c "%u.%g" "$1/home/$i") "/home/$i/.tmux.conf" status done } diff -r 67528625d306 -r 9e01bc6321ea transmission/receipt --- a/transmission/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/transmission/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -45,8 +45,8 @@ # Remove old packages name post_install() { - rm -f $1/usr/bin/transmission-gtk - rm -f $1/usr/share/applications/${PACKAGE}-gtk.desktop + rm -f "$1/usr/bin/transmission-gtk" + rm -f "$1/usr/share/applications/${PACKAGE}-gtk.desktop" chroot "$1/" /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas } diff -r 67528625d306 -r 9e01bc6321ea ttf-bitstream-vera/receipt --- a/ttf-bitstream-vera/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/ttf-bitstream-vera/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -24,8 +24,6 @@ # Pre and post install commands for Tazpkg. post_install() { - local root - root=$1 echo "Processing post-install commands..." - chroot $root/ /usr/bin/fc-cache + chroot "$1/" /usr/bin/fc-cache } diff -r 67528625d306 -r 9e01bc6321ea udev/receipt --- a/udev/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/udev/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -86,7 +86,7 @@ list_udev_group() { object=${2:-GROUP} - grep $object $1/etc/udev/rules.d/* | \ + grep $object "$1/etc/udev/rules.d/"* | \ sed "s|.*$object=\"\([a-zA-Z0-9]*\)\".*|\1|" | sort | uniq } @@ -95,10 +95,10 @@ # Sanity check for udev+ldap boot list_udev_group "$1" GROUP | \ while read x; do - grep -q ^$x: $1/etc/group || chroot $1/ addgroup -S $x + grep -q ^$x: "$1/etc/group" || chroot "$1/" addgroup -S $x done list_udev_group "$1" OWNER | \ while read x; do - grep -q ^$x: $1/etc/passwd || chroot $1/ adduser -S -D -H $x + grep -q ^$x: "$1/etc/passwd" || chroot "$1/" adduser -S -D -H $x done } diff -r 67528625d306 -r 9e01bc6321ea udhcpc6-fake/receipt --- a/udhcpc6-fake/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/udhcpc6-fake/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -19,7 +19,7 @@ # Overlap busybox pre_install() { - rm -f $1/sbin/udhcpc + rm -f "$1/sbin/udhcpc" } post_remove() diff -r 67528625d306 -r 9e01bc6321ea ufr2/receipt --- a/ufr2/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/ufr2/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -91,7 +91,7 @@ echo "The license is stored in /usr/share/licenses/$PACKAGE " echo -n "Would you like to read the license (y/N) : "; read anser if [ "$anser" = "y" ]; then - cat $1/usr/share/licenses/"$PACKAGE"/LICENSE | more + cat "$1/usr/share/licenses/$PACKAGE/LICENSE" | more echo "" fi echo "================================================================================" diff -r 67528625d306 -r 9e01bc6321ea unzip/receipt --- a/unzip/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/unzip/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -30,7 +30,7 @@ # Remove Busybox symlink before installing pre_install() { - rm -f $1/usr/bin/unzip + rm -f "$1/usr/bin/unzip" } post_remove() diff -r 67528625d306 -r 9e01bc6321ea usbmuxd/receipt --- a/usbmuxd/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/usbmuxd/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -38,15 +38,15 @@ post_install() { # adduser usbmuxd if needed - if ! grep -q usbmuxd $1/etc/passwd; then + if ! grep -q usbmuxd "$1/etc/passwd"; then echo -n "Adding user privoxy..." - chroot $1/ adduser -s /bin/false -H -D -u 140 usbmuxd + chroot "$1/" adduser -s /bin/false -H -D -u 140 usbmuxd status fi - if ! grep -q usbmuxd $1/etc/group; then + if ! grep -q usbmuxd "$1/etc/group"; then echo -n "Adding group privoxy..." - chroot $1/ addgroup -g 140 usbmuxd + chroot "$1/" addgroup -g 140 usbmuxd status fi } @@ -54,6 +54,6 @@ # Del user usbmuxd when pkg is removed. post_remove() { - chroot $1/ deluser usbmuxd - chroot $1/ delgroup usbmuxd + chroot "$1/" deluser usbmuxd + chroot "$1/" delgroup usbmuxd } diff -r 67528625d306 -r 9e01bc6321ea usbutils/receipt --- a/usbutils/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/usbutils/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -45,11 +45,11 @@ { echo "Processing pre-install commands..." echo -n "Removing Busybox lsusb... " - rm -f $root/usr/bin/lsusb + rm -f "$1/usr/bin/lsusb" status } post_remove() { - ln -s /bin/busybox $1/usr/bin/lsusb + ln -s /bin/busybox "$1/usr/bin/lsusb" } diff -r 67528625d306 -r 9e01bc6321ea util-linux-blockdev/receipt --- a/util-linux-blockdev/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/util-linux-blockdev/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -21,7 +21,7 @@ # Overlap busybox pre_install() { - rm -f $1/sbin/blockdev + rm -f "$1/sbin/blockdev" } post_remove() diff -r 67528625d306 -r 9e01bc6321ea util-linux-flock/receipt --- a/util-linux-flock/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/util-linux-flock/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -21,7 +21,7 @@ # Overlap busybox pre_install() { - rm -f $1/usr/bin/flock + rm -f "$1/usr/bin/flock" } post_remove() diff -r 67528625d306 -r 9e01bc6321ea util-linux-uuid/receipt --- a/util-linux-uuid/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/util-linux-uuid/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -29,7 +29,7 @@ { if [ -d "$1$INSTALLED/util-linux-ng-uuid" ]; then echo "Removing old: util-linux-ng-uuid" - rm -rf $1$INSTALLED/util-linux-ng-uuid + rm -rf "$1$INSTALLED/util-linux-ng-uuid" fi true } diff -r 67528625d306 -r 9e01bc6321ea vim-tiny/receipt --- a/vim-tiny/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/vim-tiny/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -57,10 +57,8 @@ post_install() { - local root - root=$1 echo "Processing post-install commands..." - cmd=`readlink $root/bin/vi` + cmd=$(readlink "$1/bin/vi") if [ ! "$cmd" = "/usr/bin/vim" ]; then echo "" echo "**** Actual VI link : $cmd" @@ -69,7 +67,7 @@ if [ "$anser" == "y" ]; then echo "" echo -n "Removing vi link to make a new one pointing on /usr/bin/vim..." - rm $root/bin/vi && ln -sf $root/usr/bin/vim-tiny $root/bin/vi + rm "$1/bin/vi" && ln -sf /usr/bin/vim-tiny "$1/bin/vi" status else echo "" @@ -82,5 +80,5 @@ { # restore previous symlink echo "Processing post-remove commands..." - ln -sf /bin/busybox $1/bin/vi + ln -sf /bin/busybox "$1/bin/vi" } diff -r 67528625d306 -r 9e01bc6321ea vim/receipt --- a/vim/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/vim/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -53,10 +53,8 @@ post_install() { - local root - root=$1 echo "Processing post-install commands..." - cmd=`readlink $root/bin/vi` + cmd=$(readlink "$1/bin/vi") if [ ! "$cmd" = "/usr/bin/vim" ]; then echo "" echo "**** Actual VI link : $cmd" @@ -65,7 +63,7 @@ if [ "$anser" == "y" ]; then echo "" echo -n "Removing vi link to make a new one pointing on /usr/bin/vim..." - rm $root/bin/vi && ln -sf $root/usr/bin/vim $root/bin/vi + rm "$1/bin/vi" && ln -sf /usr/bin/vim "$1/bin/vi" status else echo "" @@ -78,5 +76,5 @@ { # restore previous symlink echo "Processing post-remove commands..." - ln -sf /bin/busybox $1/bin/vi + ln -sf /bin/busybox "$1/bin/vi" } diff -r 67528625d306 -r 9e01bc6321ea virtualbox-ose-guestutils/receipt --- a/virtualbox-ose-guestutils/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/virtualbox-ose-guestutils/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -65,39 +65,39 @@ pre_remove() { - if chroot $1/ lspci | grep -qi virtualbox; then - sed -i "s/vboxguest vboxsf vboxvideo //" $1/etc/rcS.conf - sed -i '/# VBoxService daemon options./{N;N;N;d}' $1/etc/daemons.conf - sed -i 's/VBoxService //' $1/etc/rcS.conf - chroot $1/ delgroup vboxsf - sed -i 's/^\tDriver.*$/\tDriver "vesa"/' $1/etc/X11/xorg.conf.d/60-Device.conf + if chroot "$1/" lspci | grep -qi virtualbox; then + sed -i "s/vboxguest vboxsf vboxvideo //" "$1/etc/rcS.conf" + sed -i '/# VBoxService daemon options./{N;N;N;d}' "$1/etc/daemons.conf" + sed -i 's/VBoxService //' "$1/etc/rcS.conf" + chroot "$1/" delgroup vboxsf + sed -i 's/^\tDriver.*$/\tDriver "vesa"/' "$1/etc/X11/xorg.conf.d/60-Device.conf" fi } post_install() { - if chroot $1/ lspci | grep -qi virtualbox; then - #chroot $1/ udevadm control --reload - grep -qs VBOXSERVICE_OPTIONS $1/etc/daemons.conf || - cat >> $1/etc/daemons.conf << "EOT" + if chroot "$1/" lspci | grep -qi virtualbox; then + #chroot "$1/" udevadm control --reload + grep -qs VBOXSERVICE_OPTIONS "$1/etc/daemons.conf" || + cat >> "$1/etc/daemons.conf" << "EOT" # VBoxService daemon options. VBOXSERVICE_OPTIONS="" EOT - KERNEL_VERSION=$( chroot $1/ uname -r) - chroot $1/ depmod -a $KERNEL_VERSION - #chroot $1/ modprobe -a vboxguest vboxsf vboxvideo - sed -i 's/^\tDriver.*$/\tDriver "vboxvideo"/' $1/etc/X11/xorg.conf.d/60-Device.conf - grep -qs vboxguest $1/etc/rcS.conf || - sed -i 's/LOAD_MODULES="/&vboxguest vboxsf vboxvideo /' $1/etc/rcS.conf - grep -qs VBoxService $1/etc/rcS.conf || - sed -i 's/RUN_DAEMONS="/&VBoxService /' $1/etc/rcS.conf - grep -qs vboxsf $1/etc/group || chroot $1/ addgroup -g 109 vboxsf + KERNEL_VERSION=$( chroot "$1/" uname -r) + chroot "$1/" depmod -a $KERNEL_VERSION + #chroot "$1/" modprobe -a vboxguest vboxsf vboxvideo + sed -i 's/^\tDriver.*$/\tDriver "vboxvideo"/' "$1/etc/X11/xorg.conf.d/60-Device.conf" + grep -qs vboxguest "$1/etc/rcS.conf" || + sed -i 's/LOAD_MODULES="/&vboxguest vboxsf vboxvideo /' "$1/etc/rcS.conf" + grep -qs VBoxService "$1/etc/rcS.conf" || + sed -i 's/RUN_DAEMONS="/&VBoxService /' "$1/etc/rcS.conf" + grep -qs vboxsf "$1/etc/group" || chroot "$1/" addgroup -g 109 vboxsf echo "add yourself to vboxsf group if you want to access" echo "host shared folder: addgroup $USER vboxsf" #i can't get udev to do its work #echo "then logout and login again" - #chroot $1/ /etc/init.d/VBoxService start &> /dev/null + #chroot "$1/" /etc/init.d/VBoxService start &> /dev/null echo "then reboot" else echo "this is not a virtual machine," diff -r 67528625d306 -r 9e01bc6321ea virtualbox-ose/receipt --- a/virtualbox-ose/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/virtualbox-ose/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -124,19 +124,19 @@ pre_remove() { - sed -i "s/vboxdrv vboxnetadp vboxnetflt //" $1/etc/rcS.conf - chroot $1/ delgroup vboxusers + sed -i "s/vboxdrv vboxnetadp vboxnetflt //" "$1/etc/rcS.conf" + chroot "$1/" delgroup vboxusers } post_install() { - #chroot $1/ udevadm control --reload - KERNEL_VERSION=$( chroot $1/ uname -r) - chroot $1/ depmod -a $KERNEL_VERSION - chroot $1/ modprobe -a vboxdrv vboxnetadp vboxnetflt - grep -qs vboxdrv $1/etc/rcS.conf || - sed -i 's/LOAD_MODULES="/&vboxdrv vboxnetadp vboxnetflt /' $1/etc/rcS.conf - grep -qs vboxuser $1/etc/group || chroot $1/ addgroup -g 199 vboxusers + #chroot "$1/" udevadm control --reload + KERNEL_VERSION=$( chroot "$1/" uname -r) + chroot "$1/" depmod -a $KERNEL_VERSION + chroot "$1/" modprobe -a vboxdrv vboxnetadp vboxnetflt + grep -qs vboxdrv "$1/etc/rcS.conf" || + sed -i 's/LOAD_MODULES="/&vboxdrv vboxnetadp vboxnetflt /' "$1/etc/rcS.conf" + grep -qs vboxuser "$1/etc/group" || chroot "$1/" addgroup -g 199 vboxusers echo "add yourself to vboxusers group if you want to access" echo "host usb devices: addgroup $USER vboxusers" #i can't get udev to do its work diff -r 67528625d306 -r 9e01bc6321ea watchdog/receipt --- a/watchdog/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/watchdog/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -33,5 +33,5 @@ # Pre and post install commands for Tazpkg. post_install() { - [ -c $1/dev/watchdog ] || mknod -m 660 $1/dev/watchdog c 10 130 + [ -c "$1/dev/watchdog" ] || mknod -m 660 "$1/dev/watchdog" c 10 130 } diff -r 67528625d306 -r 9e01bc6321ea wbar/receipt --- a/wbar/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/wbar/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -38,14 +38,14 @@ # Post install/remove commands for Tazpkg. post_install() { - rm -f $1/etc/dot.wbar - [ -s $1/etc/wbar/dot.wbar ] || rm -f $1/etc/wbar/dot.wbar - mv $1/etc/wbar/dot.wbar $1/etc/wbar/dot.wbar.old 2> /dev/null && cat < /dev/null && cat < $1/etc/wbar/dot.wbar << EOT + cat > "$1/etc/wbar/dot.wbar" << EOT # The Bar && Font i: /usr/share/wbar/iconpack/osxbarback.png t: /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans/12 @@ -54,7 +54,7 @@ EOT while read icon exe text; do [ -x $exe ] || continue - cat >> $1/etc/wbar/dot.wbar << EOT + cat >> "$1/etc/wbar/dot.wbar" << EOT i: $icon c: $exe t: $text @@ -68,8 +68,8 @@ /usr/share/pixmaps/xterm.png /usr/bin/xterm xterm /usr/share/pixmaps/leafpad.png /usr/bin/leafpad leafpad EOT - grep -q 'wbar' $1/etc/xdg/openbox/autostart.sh || - cat >> $1/etc/xdg/openbox/autostart.sh << EOT + grep -q 'wbar' "$1/etc/xdg/openbox/autostart.sh" || + cat >> "$1/etc/xdg/openbox/autostart.sh" << EOT # Wbar icons panel. (sleep 2 && wbar -above-desk -pos top center -jumpf 0 -zoomf 1.5 -bpress -balfa 0) & @@ -78,6 +78,6 @@ post_remove() { - sed -i '/Wbar/ d' $1/etc/xdg/openbox/autostart.sh - sed -i '/wbar/ d' $1/etc/xdg/openbox/autostart.sh + sed -i '/Wbar/ d' "$1/etc/xdg/openbox/autostart.sh" + sed -i '/wbar/ d' "$1/etc/xdg/openbox/autostart.sh" } diff -r 67528625d306 -r 9e01bc6321ea webalizer/receipt --- a/webalizer/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/webalizer/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -44,8 +44,8 @@ # Pre and post install commands for Tazpkg. post_install() { - grep -q webalizer $1/etc/init.d/local.sh || \ - cat >> $1/etc/init.d/local.sh <> "$1/etc/init.d/local.sh" <> $root/etc/daemons.conf - echo 'WICD_OPTIONS=""' >> $root/etc/daemons.conf - echo '' >> $root/etc/daemons.conf + if ! grep -q ^WICD_OPTIONS "$1/etc/daemons.conf"; then + echo '# wicd options.' >> "$1/etc/daemons.conf" + echo 'WICD_OPTIONS=""' >> "$1/etc/daemons.conf" + echo '' >> "$1/etc/daemons.conf" fi } diff -r 67528625d306 -r 9e01bc6321ea wine/receipt --- a/wine/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/wine/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -39,12 +39,12 @@ [ "$1" ] || modprobe snd-seq 2>/dev/null # Enable unicode filenames and localized keyboard layouts input - . $1/etc/locale.conf + . "$1/etc/locale.conf" case $LANG in (C|POSIX|*UTF-8) echo $LANG - skip modifying /etc/locale.conf ;; (*) echo "$LANG changed to ${LANG}.UTF-8 in /etc/locale.conf" echo "Restart/ReLogin required." - sed -i 's/$/&.UTF-8/' $1/etc/locale.conf ;; + sed -i 's/$/&.UTF-8/' "$1/etc/locale.conf" ;; esac } diff -r 67528625d306 -r 9e01bc6321ea wordpress/receipt --- a/wordpress/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/wordpress/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -28,7 +28,7 @@ local db_password=wordpress # Minimal config for wordpress. - if [ -z $1 ]; then + if [ -z "$1" ]; then if ( ! mysqladmin -s ping > /dev/null ); then echo "Starting MySQL server" ( /etc/init.d/mysql start ; status ) || exit @@ -56,7 +56,7 @@ local db_user=wordpress local db_password=wordpress - if [ -z $1 ]; then + if [ -z "$1" ]; then echo -n "Would you like to remove data and database files.(y/n) " read answer diff -r 67528625d306 -r 9e01bc6321ea wpa_supplicant/receipt --- a/wpa_supplicant/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/wpa_supplicant/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -91,15 +91,15 @@ # Pre and post install commands for Tazpkg. post_install() { - grep -qs ^WPA_OPTIONS= $1/etc/daemons.conf || cat >> $1/etc/daemons.conf << EOT + grep -qs ^WPA_OPTIONS= $1/etc/daemons.conf || cat >> "$1/etc/daemons.conf" << EOT # wpa_supplicant daemon options WPA_OPTIONS="-B -u -P /var/run/wpa_supplicant.pid -c /etc/wpa/wpa.conf -i \$(. /etc/network.conf ; echo \$WIFI_INTERFACE)" EOT # We use /etc/wpa/wpa.conf from SliTaz 5.0 - sed -i s'#/etc/wpa_supplicant.conf#/etc/wpa/wpa.conf#'/ $1/etc/daemons.conf 2> /dev/null + sed -i s'#/etc/wpa_supplicant.conf#/etc/wpa/wpa.conf#'/ "$1/etc/daemons.conf" 2> /dev/null # 'w' option dont exist anymore with < 0.6.9 - sed -i s/'-Bw'/'-B'/ $1/etc/daemons.conf 2> /dev/null - sed -i s/'-B -w'/'-B'/g $1/etc/init.d/network.sh 2> /dev/null + sed -i s/'-Bw'/'-B'/ "$1/etc/daemons.conf" 2> /dev/null + sed -i s/'-B -w'/'-B'/g "$1/etc/init.d/network.sh" 2> /dev/null } diff -r 67528625d306 -r 9e01bc6321ea wvstreams/receipt --- a/wvstreams/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/wvstreams/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -45,5 +45,5 @@ post_remove() { - rm -rf $1/etc/ppp/peers/wvdial + rm -rf "$1/etc/ppp/peers/wvdial" } diff -r 67528625d306 -r 9e01bc6321ea x11vnc-extra/receipt --- a/x11vnc-extra/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/x11vnc-extra/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -23,5 +23,5 @@ # Post install/remove commands for Tazpkg. post_install() { - sed -i 's/X11VNC_OPTIONS="/X11VNC_OPTIONS="-ssl -http /' $1/etc/daemons.conf + sed -i 's/X11VNC_OPTIONS="/X11VNC_OPTIONS="-ssl -http /' "$1/etc/daemons.conf" } diff -r 67528625d306 -r 9e01bc6321ea x11vnc/receipt --- a/x11vnc/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/x11vnc/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -36,12 +36,12 @@ # Post install/remove commands for Tazpkg. post_install() { - grep -q "^X11VNC" $1/etc/daemons.conf || cat >>$1/etc/daemons.conf <> "$1/etc/daemons.conf" <> $1/etc/services <> "$1/etc/services" <> $1/etc/inetd.conf <> "$1/etc/inetd.conf" < /tmp/listeXdefaults + find "$1/home" -maxdepth 2 -name ".Xdefaults" > /tmp/listeXdefaults while read line do if ! grep -q "Xvkbd settings" $line; then diff -r 67528625d306 -r 9e01bc6321ea xz/receipt --- a/xz/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/xz/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -42,17 +42,15 @@ # #pre_install() #{ -# local root -# root=$1 # echo "Processing pre-install commands..." # echo -n "Removing all Busybox replaced utils... " -# rm -f $root/usr/bin/unlzma -# rm -f $root/usr/bin/lzcat +# rm -f "$1/usr/bin/unlzma" +# rm -f "$1/usr/bin/lzcat" # status #} #post_remove() #{ -# ln -s /bin/busybox $1/usr/bin/unlzma -# ln -s /bin/busybox $1/usr/bin/lzcat +# ln -s /bin/busybox "$1/usr/bin/unlzma" +# ln -s /bin/busybox "$1/usr/bin/lzcat" #} diff -r 67528625d306 -r 9e01bc6321ea yasr/receipt --- a/yasr/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/yasr/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -35,7 +35,7 @@ { # Enable speech-synthesizer in config file echo -n "Enabling config file..." - cd $1/usr/share/yasr + cd "$1/usr/share/yasr" sed -i 's/synthesizer=emacspeak/#synthesizer=emacspeak/; \ s/#synthesizer=speech/synthesizer=speech/; \ s/synthesizer port=|/#synthesizer port=|/; \ diff -r 67528625d306 -r 9e01bc6321ea zerobin/receipt --- a/zerobin/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/zerobin/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -38,9 +38,9 @@ post_install() { # Configure lighttpd server - if [ -f $1/etc/lighttpd/lighttpd.conf ]; then - if ! grep -q /usr/share/zerobin/ $1/etc/lighttpd/lighttpd.conf; then - sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/paste/" => "/usr/share/zerobin/",|g' -i $1/etc/lighttpd/lighttpd.conf + if [ -f "$1/etc/lighttpd/lighttpd.conf" ]; then + if ! grep -q /usr/share/zerobin/ "$1/etc/lighttpd/lighttpd.conf"; then + sed -e 's|.*"/examples/" => "/usr/share/examples/",| "/examples/" => "/usr/share/examples/",\n "/paste/" => "/usr/share/zerobin/",|g' -i "$1/etc/lighttpd/lighttpd.conf" if [ -z "$1" ]; then # Start Web server. /etc/init.d/lighttpd stop @@ -49,10 +49,10 @@ fi fi # Configure apache server - if [ -f $1/etc/apache/httpd.conf ]; then - sed -i 's/lighttpd/apache/' $1/etc/rcS.conf - if [ ! -f $1/etc/apache/conf.d/zerobin ]; then - cat > $1/etc/apache/conf.d/zerobin < "$1/etc/apache/conf.d/zerobin" < Alias /paste /usr/share/zerobin/ diff -r 67528625d306 -r 9e01bc6321ea zsh/receipt --- a/zsh/receipt Sat Dec 19 21:50:31 2015 +0100 +++ b/zsh/receipt Sun Dec 20 15:13:45 2015 +0100 @@ -48,10 +48,8 @@ # post_install() { - local root - root=$1 echo "Processing post-install commands..." - sh=`readlink $root/bin/sh` + sh=$(readlink "$1/bin/sh") if [ ! "$sh" = "/bin/zsh" ]; then echo "" echo "**** Actual SH link : $sh" @@ -60,8 +58,8 @@ read -t 30 answer < /dev/tty if [ "$answer" == "y" ]; then echo "" - echo -n "Removin sh link to make a new one pointing on /bin/zsh..." - rm $root/bin/sh && ln -s /bin/zsh $root/bin/sh + echo -n "Removing sh link to make a new one pointing on /bin/zsh..." + rm "$1/bin/sh" && ln -s /bin/zsh "$1/bin/sh" status else echo "" @@ -73,11 +71,9 @@ # Restore a valid sh link if needed. pre_remove() { - local root - root=$1 - sh=`readlink $root/bin/sh` + sh=$(readlink "$1/bin/sh") if [ ! "$sh" = "busybox" ]; then - rm $root/bin/sh && - ln -s /bin/busybox $root/bin/sh + rm "$1/bin/sh" && + ln -s /bin/busybox "$1/bin/sh" fi }