[ooo-build-commit] .: bin/piece
Petr Mladek
pmladek at kemper.freedesktop.org
Thu May 20 07:57:13 PDT 2010
bin/piece/install-devel-helper | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 11e0e111024edc85bce89c4a427e6e09f755fbe5
Author: Petr Mladek <pmladek at suse.cz>
Date: Thu May 20 16:55:51 2010 +0200
Sort filelists to get repeatable results
* bin/piece/install-devel-helper: sort filelists; fix by Andreas Jaeger
<aj at suse dot de>
diff --git a/bin/piece/install-devel-helper b/bin/piece/install-devel-helper
index cfe96f5..d92f804 100755
--- a/bin/piece/install-devel-helper
+++ b/bin/piece/install-devel-helper
@@ -14,10 +14,10 @@ mv $DESTDIR$OO_INSTDIR/solver $DESTDIR$OO_INSTDIR_SHARE
# file list for the devel stuff
echo "%dir $OO_INSTDIR_SHARE" >files-$piece-devel.txt
-for dir in `find $DESTDIR$OO_INSTDIR_SHARE/solver -type d | sed "s|$DESTDIR||" | grep -v "$OO_INSTDIR_SHARE/solver/noarch"` ; do
+for dir in `find $DESTDIR$OO_INSTDIR_SHARE/solver -type d | sed "s|$DESTDIR||" | grep -v "$OO_INSTDIR_SHARE/solver/noarch"|sort` ; do
echo "%dir $dir" >>files-$piece-devel.txt
done
-find $DESTDIR$OO_INSTDIR_SHARE/solver -type f | sed "s|$DESTDIR||" | grep -v "$OO_INSTDIR_SHARE/solver/noarch" >>files-$piece-devel.txt
+find $DESTDIR$OO_INSTDIR_SHARE/solver -type f | sed "s|$DESTDIR||" | grep -v "$OO_INSTDIR_SHARE/solver/noarch"|sort >>files-$piece-devel.txt
# install the list for link-to-ooo-home script if not empty; top dir is always mentioned
if test `cat files-$piece-devel.txt | wc -l` -gt 1 ; then
cp files-$piece-devel.txt $DESTDIR$OO_INSTDIR_SHARE/
@@ -26,10 +26,10 @@ fi
# file list for the prebuilt stuff if any
rm -f files-$piece-prebuilt.txt
-for dir in `find $DESTDIR$OO_INSTDIR_SHARE/solver -type d | sed "s|$DESTDIR||" | grep "$OO_INSTDIR_SHARE/solver/noarch"` ; do
+for dir in `find $DESTDIR$OO_INSTDIR_SHARE/solver -type d | sed "s|$DESTDIR||" | grep "$OO_INSTDIR_SHARE/solver/noarch"|sort` ; do
echo "%dir $dir" >>files-$piece-prebuilt.txt
done
-find $DESTDIR$OO_INSTDIR_SHARE/solver -type f | sed "s|$DESTDIR||" | grep "$OO_INSTDIR_SHARE/solver/noarch" >>files-$piece-prebuilt.txt
+find $DESTDIR$OO_INSTDIR_SHARE/solver -type f | sed "s|$DESTDIR||" | grep "$OO_INSTDIR_SHARE/solver/noarch"|sort >>files-$piece-prebuilt.txt
# install the list for link-to-ooo-home script if not empty
if test `cat files-$piece-prebuilt.txt | wc -l` -gt 1 ; then
cp files-$piece-prebuilt.txt $DESTDIR$OO_INSTDIR_SHARE/
More information about the ooo-build-commit
mailing list