DirRights im /tmp sollten jetzt wieder aufgeraumt werden.
rm kommandos mit option -f versehen -> das vermeidet unnötige Fehlermeldungen git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@4961 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
kueller
parent
b77894f6aa
commit
4070013a8f
@ -142,16 +142,16 @@ CheckError() {
|
||||
CleanUp() {
|
||||
(( TESTFLAG = $CLEANUP_FLAGS & 1 ))
|
||||
if [ ! "$TESTFLAG" == "0" ]; then
|
||||
rm -r $MAKEDIR/$SRCDIR*
|
||||
rm -rf $MAKEDIR/$SRCDIR*
|
||||
fi
|
||||
(( TESTFLAG = $CLEANUP_FLAGS & 2 ))
|
||||
if [ ! "$TESTFLAG" == "0" ]; then
|
||||
rm -r $TMPROOT
|
||||
rm -rf $TMPROOT
|
||||
if [ -d "$MANTMPROOT" ]; then
|
||||
rm -r $MANTMPROOT
|
||||
rm -rf $MANTMPROOT
|
||||
fi
|
||||
if [ -d "$DEVTMPROOT" ]; then
|
||||
rm -r $DEVTMPROOT
|
||||
rm -rf $DEVTMPROOT
|
||||
fi
|
||||
fi
|
||||
(( TESTFLAG = $CLEANUP_FLAGS & 4 ))
|
||||
@ -164,7 +164,7 @@ CleanUp() {
|
||||
fi
|
||||
(( TESTFLAG = $CLEANUP_FLAGS & 16 ))
|
||||
if [ ! "$TESTFLAG" == "0" ]; then
|
||||
rm /usr/X11R6
|
||||
rm -f /usr/X11R6
|
||||
fi
|
||||
(( TESTFLAG = $CLEANUP_FLAGS & 32 ))
|
||||
if [ ! "$TESTFLAG" == "0" ]; then
|
||||
@ -175,7 +175,7 @@ CleanUp() {
|
||||
PKG_CONFIG_PATH=$STOREPKG_CONFIG_PATH
|
||||
fi
|
||||
if [ -d /usr/include/linux.orig ]; then
|
||||
rm /usr/include/linux
|
||||
rm -f /usr/include/linux
|
||||
mv /usr/include/linux.orig /usr/include/linux
|
||||
fi
|
||||
return 0
|
||||
@ -297,7 +297,7 @@ GetSVN() {
|
||||
svn co $SVNURL/$SVNPROJ
|
||||
cd $SVNPROJ
|
||||
ADDONVERSION=`svn info .|grep Revision|awk '{print $2}'`
|
||||
find . -name ".svn" -type d -exec rm -r {} \;
|
||||
find . -name ".svn" -type d -exec rm -rf {} \;
|
||||
for i in `find . -type d`; do
|
||||
case $i in
|
||||
./etc)
|
||||
@ -322,17 +322,17 @@ GetSVN() {
|
||||
fi
|
||||
msgfmt $i -o $DSTDIR/$BASE.mo
|
||||
done
|
||||
rm -r locale
|
||||
rm -rf locale
|
||||
;;
|
||||
esac
|
||||
done
|
||||
if [ -f init/genpkg ]; then
|
||||
source init/genpkg
|
||||
rm -r init
|
||||
rm -rf init
|
||||
fi
|
||||
cp -rp * $PKGROOT
|
||||
cd $CDIR
|
||||
rm -r /tmp/svntmp$$
|
||||
rm -rf /tmp/svntmp$$
|
||||
}
|
||||
|
||||
GenDependics() {
|
||||
@ -340,7 +340,7 @@ GenDependics() {
|
||||
|
||||
cd $PKGROOT
|
||||
if [ -f /tmp/lddlist$$ ]; then
|
||||
rm /tmp/lddlist$$
|
||||
rm -f /tmp/lddlist$$
|
||||
fi
|
||||
for execfile in `find $PKGROOT -type f ! -type l -perm -u+rx,g+rx`; do
|
||||
if file $execfile |grep "LSB executable" &>/dev/null; then
|
||||
@ -357,7 +357,7 @@ GenDependics() {
|
||||
for i in `cat /tmp/lddlist$$`; do
|
||||
grep "$i;" $ROOT/var/install/contents|awk -F";" '{print $1}'|sed -e "s/PN=//"
|
||||
done|sort -u
|
||||
rm /tmp/lddlist$$
|
||||
rm -f /tmp/lddlist$$
|
||||
fi
|
||||
cd - >/dev/null
|
||||
}
|
||||
@ -396,13 +396,13 @@ ClearHostSysNameing32() {
|
||||
FILELINK=`basename $LINKFROM`
|
||||
DIRLINK=`dirname $LINKFROM`
|
||||
cd $DIRLINK
|
||||
rm $FILELINK
|
||||
rm -f $FILELINK
|
||||
ln -s $LINKTO $FILELINK
|
||||
cd -
|
||||
read <&3 LINE
|
||||
done
|
||||
exec 3>&-
|
||||
rm /tmp/linklist$$
|
||||
rm -f /tmp/linklist$$
|
||||
for i in `find . -type l -ls|grep $HOSTSYS`; do
|
||||
LINTO=`echo $i|awk '{print $10}'`
|
||||
echo $LINTO
|
||||
@ -430,13 +430,13 @@ ClearHostSysNameing() {
|
||||
FILELINK=`basename $LINKFROM`
|
||||
DIRLINK=`dirname $LINKFROM`
|
||||
cd $DIRLINK
|
||||
rm $FILELINK
|
||||
rm -f $FILELINK
|
||||
ln -s $LINKTO $FILELINK
|
||||
cd -
|
||||
read <&3 LINE
|
||||
done
|
||||
exec 3>&-
|
||||
rm /tmp/linklist$$
|
||||
rm -f /tmp/linklist$$
|
||||
for i in `find . -type l -ls|grep $HOSTSYS`; do
|
||||
LINTO=`echo $i|awk '{print $10}'`
|
||||
echo $LINTO
|
||||
@ -555,6 +555,7 @@ MakeMgtFiles() {
|
||||
echo "$NAME `GetFlags $RIGHTS` $USERID $GROUPID"
|
||||
done >$TMPROOT/../$$/$FilePrefix.drg
|
||||
exec 3>&-
|
||||
rm -f /tmp/DirRight$$.$FilePrefix
|
||||
find . ! -type d -ls|\
|
||||
awk '{ print $3,$5,$6,$11 }'|\
|
||||
sed -e "s/\.\//\//" >/tmp/FileList$$
|
||||
@ -596,7 +597,7 @@ MakeMgtFiles() {
|
||||
echo "PN=$SHNAME;FN=$NAME;FT=$TYPE;FR=$RIGHT;FO=$OWNER;FS=$MDSUM;PK=$PKGNAME"
|
||||
done >$TMPROOT/../$$/$FilePrefix.cont
|
||||
exec 3>&-
|
||||
rm /tmp/FileList$$
|
||||
rm -f /tmp/FileList$$
|
||||
}
|
||||
|
||||
X11R7_Fix() {
|
||||
@ -632,7 +633,7 @@ SetConfig() {
|
||||
|
||||
MakeFifo() {
|
||||
TMPFILE=`mktemp`
|
||||
rm $TMPFILE
|
||||
rm -f $TMPFILE
|
||||
mkfifo --mode=600 $TMPFILE
|
||||
echo $TMPFILE
|
||||
return 0
|
||||
@ -647,7 +648,7 @@ ExecCommand() {
|
||||
for i in `echo $COMMAND|awk -F" && " '{print $1";"$2";"$3";"$4";"$5";"$6 }'`; do
|
||||
unset IFS
|
||||
if [[ "$i" == *wshutdown* ]]; then
|
||||
rm ${CMDF[${CMDNUM}]}
|
||||
rm -f ${CMDF[${CMDNUM}]}
|
||||
return 0
|
||||
fi
|
||||
$i
|
||||
@ -699,7 +700,7 @@ EOF
|
||||
done
|
||||
wait
|
||||
exec 8<&-
|
||||
rm $FREEF
|
||||
rm -f $FREEF
|
||||
}
|
||||
|
||||
GenDynLib32() {
|
||||
@ -716,7 +717,7 @@ GenDynLib32() {
|
||||
ln -s $LIBNAME.so.$DYNLIBVER $DYNLIBDIR/$LIBNAME.so.$BASEVER
|
||||
ln -sf $LIBNAME.so.$DYNLIBVER $DYNLIBDIR/$LIBNAME.so
|
||||
cd -
|
||||
rm -r /tmp/libgen$$
|
||||
rm -rf /tmp/libgen$$
|
||||
}
|
||||
|
||||
GenDynLib() {
|
||||
@ -733,7 +734,7 @@ GenDynLib() {
|
||||
ln -s $LIBNAME.so.$DYNLIBVER $DYNLIBDIR/$LIBNAME.so.$BASEVER
|
||||
ln -sf $LIBNAME.so.$DYNLIBVER $DYNLIBDIR/$LIBNAME.so
|
||||
cd -
|
||||
rm -r /tmp/libgen$$
|
||||
rm -rf /tmp/libgen$$
|
||||
}
|
||||
|
||||
extractfile() {
|
||||
|
||||
16
genpkg
16
genpkg
@ -279,7 +279,7 @@ pkggen() {
|
||||
if [ -d /tmp/$DSTPKGNAME ]; then
|
||||
mv /tmp/$DSTPKGNAME /var/install
|
||||
fi
|
||||
rm /tmp/deps$$
|
||||
rm -f /tmp/deps$$
|
||||
cd $AKTDIR
|
||||
StripPkg $TMPROOT
|
||||
postmk
|
||||
@ -323,7 +323,7 @@ pkggen() {
|
||||
cd $i
|
||||
tar -cf - .|tar -C $MANTMPROOT/usr/share/doc -xf -
|
||||
cd -
|
||||
rm -r $i
|
||||
rm -rf $i
|
||||
done
|
||||
for i in `find . -name "*.[ah]"`; do
|
||||
DIR=`dirname $i`
|
||||
@ -447,7 +447,7 @@ pkggen() {
|
||||
fi
|
||||
done
|
||||
cd ..
|
||||
rm -r $TMPROOT/../$$
|
||||
rm -rf $TMPROOT/../$$
|
||||
fi
|
||||
(( CHECKFLAGS = $MKPKG & 16 ))
|
||||
if [ "$CHECKFLAGS" == "0" ]; then
|
||||
@ -500,10 +500,10 @@ pkggen() {
|
||||
awk '{print $2}' \
|
||||
>$ROOT/var/install/$PKGNAME/shortname
|
||||
if [ "`wc -c $ROOT/var/install/$PKGNAME/description|awk '{print $1}'`" == "0" ]; then
|
||||
rm $ROOT/var/install/$PKGNAME/description
|
||||
rm -f $ROOT/var/install/$PKGNAME/description
|
||||
fi
|
||||
if [ "`wc -c $ROOT/var/install/$PKGNAME/shortname|awk '{print $1}'`" == "0" ]; then
|
||||
rm $ROOT/var/install/$PKGNAME/shortname
|
||||
rm -f $ROOT/var/install/$PKGNAME/shortname
|
||||
fi
|
||||
if [ -f $ROOT/var/install/$PKGNAME/shortname ]; then
|
||||
SHNAME=`cat $ROOT/var/install/$PKGNAME/shortname`
|
||||
@ -514,13 +514,13 @@ pkggen() {
|
||||
extractfile $DISTTARGET/$SRCPATH/$PKGNAME.vpg $k.cont >>/var/install/contents
|
||||
extractfile $DISTTARGET/$SRCPATH/$PKGNAME.vpg $k.drg >/var/install/$PKGNAME/$k/DirRights
|
||||
if [ "`wc -c /var/install/$PKGNAME/$k/DirRights|awk '{print $1}'`" == "0" ]; then
|
||||
rm /var/install/$PKGNAME/$k/DirRights
|
||||
rm -f /var/install/$PKGNAME/$k/DirRights
|
||||
fi
|
||||
done
|
||||
if [ -f /tmp/postinstall ]; then
|
||||
source /tmp/postinstall
|
||||
CheckError "postinstall of $PKGNAME failed"
|
||||
rm /tmp/postinstall
|
||||
rm -f /tmp/postinstall
|
||||
CheckError "Deletion of /tmp/postinstall failed"
|
||||
fi
|
||||
fi
|
||||
@ -769,5 +769,5 @@ if [ ! "$C_FLAG" == "0" ]; then
|
||||
fi
|
||||
done
|
||||
4>&-
|
||||
rm $TMPPATH/genpkgcfg$$
|
||||
rm -f $TMPPATH/genpkgcfg$$
|
||||
fi
|
||||
|
||||
Loading…
Reference in New Issue
Block a user