Fix $HOME.

Support --uniqueext.
Ignore kernel.* duplicates.

diff --git a/bin/mockupdate b/bin/mockupdate
index b62c493..c03a5be 100755 (executable)
--- a/bin/mockupdate
+++ b/bin/mockupdate
@@ -13,8 +13,8 @@ if [ "$1" = "-q" ];then
        shift
 fi
 
-if [ -z "$HOME" ];then
-       HOME=/root
+if [ -z "$HOME" -o "$HOME" = "/" ];then
+       export HOME=/root
 fi
 
 for i in "$@";do
@@ -46,11 +46,13 @@ for i in "$@";do
                continue
        fi
 
+       r="$(basename $i|sed 's/\(-x86_64\|-i.86\)-.*$/\1/')"
+       r="$r$(basename $i|sed -n 's/^.*\(-x86_64\|-i.86\)-\(.*\)$/ --uniqueext=\2/p')"
        /usr/local/sbin/mocksetup -u `basename $i`
        rm -f $i/root/var/lib/rpm/__db.*
        if ! $quick;then
-               mock $opts -r `basename $i` --update
-               mock $opts -r `basename $i` --install `cat ~/src/INSTALL`
+               mock $opts -r $r --update
+               mock $opts -r $r --install `cat $HOME/src/INSTALL`
        fi
        # Run: yum groupinstall buildsys-build
        # Cleaning would undo the changes above.
@@ -66,7 +68,7 @@ for i in "$@";do
        # Leftover usually just removing vital system packages:
        rm -f $i/root/var/lib/yum/transaction-*
        # Print duplicates:
-       rpm -r $i/root --qf '%{name}.%{arch}\n' -qa|sort|uniq -d|sed -e '1s/^/ror duplicity:\n/' -e '1s/^/mockupdate er/'
+       rpm -r $i/root --qf '%{name}.%{arch}\n' -qa|sort|uniq -d|grep -v '^kernel\.'|sed -e '1s/^/ror duplicity:\n/' -e '1s/^/mockupdate er/'
 done
 
 echo done mockupdate "$*"