# HG changeset patch # User Pascal Bellard # Date 1450652834 -3600 # Node ID ed8073aa8cf01ada61bee30896221040018c1b34 # Parent 60ed06eac8b97a39707bff93e10526b79d1ec290 Quote root dir in post_install (again) diff -r 60ed06eac8b9 -r ed8073aa8cf0 boxbackup-server/receipt --- a/boxbackup-server/receipt Mon Dec 21 01:01:58 2015 +0200 +++ b/boxbackup-server/receipt Mon Dec 21 00:07:14 2015 +0100 @@ -62,7 +62,7 @@ { # default conf dir is now /etc/boxbackup if [ ! -e "$1/etc/box/bbstored.conf" ]; then - mv /etc/box "$1$CONF_DIR" + mv "$1/etc/box" "$1$CONF_DIR" fi # adduser BBUSER if needed diff -r 60ed06eac8b9 -r ed8073aa8cf0 docbook-xml/receipt --- a/docbook-xml/receipt Mon Dec 21 01:01:58 2015 +0200 +++ b/docbook-xml/receipt Mon Dec 21 00:07:14 2015 +0100 @@ -266,9 +266,9 @@ "/etc/xml/docbook-xml" if [ -f "$1/etc/xml/catalog" ]; then - xmlcatalog --noout "$1/etc/xml/catalog" + chroot "$1/" xmlcatalog --noout /etc/xml/catalog else - xmlcatalog --noout --create "$1/etc/xml/catalog" + chroot "$1/" xmlcatalog --noout --create /etc/xml/catalog fi chroot "$1/" xmlcatalog --noout --add "delegatePublic" \ "-//OASIS//ENTITIES DocBook XML" \ diff -r 60ed06eac8b9 -r ed8073aa8cf0 elksemu/receipt --- a/elksemu/receipt Mon Dec 21 01:01:58 2015 +0200 +++ b/elksemu/receipt Mon Dec 21 00:07:14 2015 +0100 @@ -35,6 +35,6 @@ # Pre remove command for Tazpkg. pre_remove() { - echo -1 > "$1/proc/sys/fs/binfmt_misc/i86-elks" + echo -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 60ed06eac8b9 -r ed8073aa8cf0 mingw32-gcc-c/receipt --- a/mingw32-gcc-c/receipt Mon Dec 21 01:01:58 2015 +0200 +++ b/mingw32-gcc-c/receipt Mon Dec 21 00:07:14 2015 +0100 @@ -66,7 +66,7 @@ post_install() { # Archives get stripped during packaging; need to run ranlib - find "$1/usr/lib/gcc/$MINGW32_ID/" -name *.a -exec $MINGW32_ID-ranlib {} \; + chroot "$1/" find "/usr/lib/gcc/$MINGW32_ID/" -name *.a -exec $MINGW32_ID-ranlib {} \; } # Rules to clean the package diff -r 60ed06eac8b9 -r ed8073aa8cf0 mingw32-gcc/receipt --- a/mingw32-gcc/receipt Mon Dec 21 01:01:58 2015 +0200 +++ b/mingw32-gcc/receipt Mon Dec 21 00:07:14 2015 +0100 @@ -84,8 +84,8 @@ post_install() { # Archives get stripped during packaging; need to run 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 {} \; + chroot "$1/" find "/usr/lib/gcc/$MINGW32_ID/" -name *.a -exec $MINGW32_ID-ranlib {} \; + chroot "$1/" find "/usr/$MINGW32_ID/lib/" -name *.a -exec $MINGW32_ID-ranlib {} \; } # Rules to clean the package diff -r 60ed06eac8b9 -r ed8073aa8cf0 mingw32-runtime/receipt --- a/mingw32-runtime/receipt Mon Dec 21 01:01:58 2015 +0200 +++ b/mingw32-runtime/receipt Mon Dec 21 00:07:14 2015 +0100 @@ -54,7 +54,7 @@ post_install() { # Archives get stripped during packaging; need to run ranlib - find "$1/usr/$MINGW32_ID/lib/" -name *.a -exec $MINGW32_ID-ranlib {} \; + chroot "$1/" find "/usr/$MINGW32_ID/lib/" -name *.a -exec $MINGW32_ID-ranlib {} \; } # Rules to clean the package diff -r 60ed06eac8b9 -r ed8073aa8cf0 mingw32-w32api/receipt --- a/mingw32-w32api/receipt Mon Dec 21 01:01:58 2015 +0200 +++ b/mingw32-w32api/receipt Mon Dec 21 00:07:14 2015 +0100 @@ -54,7 +54,7 @@ post_install() { # Archives get stripped during packaging; need to run ranlib - find "$1/usr/$MINGW32_ID/lib/" -name *.a -exec $MINGW32_ID-ranlib {} \; + chroot "$1/" find "/usr/$MINGW32_ID/lib/" -name *.a -exec $MINGW32_ID-ranlib {} \; } # Rules to clean the package diff -r 60ed06eac8b9 -r ed8073aa8cf0 mplayerplug-in/receipt --- a/mplayerplug-in/receipt Mon Dec 21 01:01:58 2015 +0200 +++ b/mplayerplug-in/receipt Mon Dec 21 00:07:14 2015 +0100 @@ -72,8 +72,9 @@ { echo -n "Processing post install commands..." get_firefox_version "$1" - for i in "$1"/usr/lib/mozilla/plugins/$PACKAGE*.so ; do - ln -s "$i" "$2/usr/lib/firefox-$FIREFOX_VER/plugins" + cd "$1/" + for i in usr/lib/mozilla/plugins/$PACKAGE*.so ; do + ln -s "/$i" "$1/usr/lib/firefox-$FIREFOX_VER/plugins" done status } diff -r 60ed06eac8b9 -r ed8073aa8cf0 mysql/receipt --- a/mysql/receipt Mon Dec 21 01:01:58 2015 +0200 +++ b/mysql/receipt Mon Dec 21 00:07:14 2015 +0100 @@ -114,7 +114,7 @@ -g "MySQL Daemon user" -u 27 -H -D -S -G ${group} ${user} status fi - #chroot "$1/" /bin/chown ${user}.${group} $(cat $1/$INSTALLED/$PACKAGE/files.list) + #chroot "$1/" /bin/chown ${user}.${group} $(cat "$1/$INSTALLED/$PACKAGE/files.list") chroot "$1/" /bin/chown -R ${user}.${group} /var/lib/mysql chroot "$1/" mysql_install_db --user=${user} --basedir=/usr cat < "$1/proc/sys/fs/binfmt_misc/BOOTBIN" - echo -1 > "$1/proc/sys/fs/binfmt_misc/DOSCOM" + echo -1 > /proc/sys/fs/binfmt_misc/BOOTBIN + echo -1 > /proc/sys/fs/binfmt_misc/DOSCOM sed -i '/binfmt_misc/{NN;/DOSCOM:E::com/d}' "$1/etc/init.d/local.sh" } diff -r 60ed06eac8b9 -r ed8073aa8cf0 squidguard/receipt --- a/squidguard/receipt Mon Dec 21 01:01:58 2015 +0200 +++ b/squidguard/receipt Mon Dec 21 00:07:14 2015 +0100 @@ -67,13 +67,13 @@ { chown -R nobody "$1"/var/lib/squidGuard/* # Recharge squid config - [ -z "$1" ] && [ -x $(which squid) ] && $(which squid) -k reconfigure 2> /dev/null + [ "$1" ] || { [ -x $(which squid) ] && $(which squid) -k reconfigure 2> /dev/null; } } post_remove() { # Recharge squid config - [ -z "$1" ] && [ -x $(which squid) ] && $(which squid) -k reconfigure 2> /dev/null + [ "$1" ] || { [ -x $(which squid) ] && $(which squid) -k reconfigure 2> /dev/null; } } check_config() diff -r 60ed06eac8b9 -r ed8073aa8cf0 tiptop/receipt --- a/tiptop/receipt Mon Dec 21 01:01:58 2015 +0200 +++ b/tiptop/receipt Mon Dec 21 00:07:14 2015 +0100 @@ -32,7 +32,7 @@ post_install() { for i in $(ls "$1/home" 2> /dev/null); do - [ -f "/home/$i/.tiptoprc" ] && continue + [ -f "$1/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 diff -r 60ed06eac8b9 -r ed8073aa8cf0 tmux-mem-cpu-load/receipt --- a/tmux-mem-cpu-load/receipt Mon Dec 21 01:01:58 2015 +0200 +++ b/tmux-mem-cpu-load/receipt Mon Dec 21 00:07:14 2015 +0100 @@ -36,9 +36,9 @@ post_install() { for i in $(ls "$1/home" 2> /dev/null); do - grep -qs "tmux-mem-cpu-load" "/home/$i/.tmux.conf" && continue + grep -qs "tmux-mem-cpu-load" "$1/home/$i/.tmux.conf" && continue echo -n "Checking for .tmux.conf for $i ..." - cp -a "$1/etc/skel/.tmux.conf" "/home/$i/" + cp -a "$1/etc/skel/.tmux.conf" "$1/home/$i/" chroot "$1/" chown $(stat -c "%u.%g" "$1/home/$i") "/home/$i/.tmux.conf" status done