Anpassung an neue Archiv Versionen. Oxygen gibts leider nicht mehr mit 64 Bit, dafür aber OpenOffice
git-svn-id: svn://svn.compuextreme.de/Viitor/V961/ViitorMake@4543 504e572c-2e33-0410-9681-be2bf7408885
This commit is contained in:
parent
8453bc5c4a
commit
b3f4d13e7f
@ -75,9 +75,14 @@ SRCPATH=X11_2/Office
|
|||||||
|
|
||||||
premk() {
|
premk() {
|
||||||
cd $MAKEDIR
|
cd $MAKEDIR
|
||||||
tar -zxvf $LFSSOURCE/$SRCPATH/OOo*.tar.gz
|
if [ "$MK64BIT" == "true" ]; then
|
||||||
|
tar -zxvf $LFSSOURCE/$SRCPATH/OOo_*_LinuxX86-64_install_wJRE_de.tar.gz
|
||||||
|
VERSION=`ls $LFSSOURCE/$SRCPATH/OOo_*_LinuxX86-64_install_wJRE_de.tar.gz|awk -F "_" '{print $2}'`
|
||||||
|
else
|
||||||
|
tar -zxvf $LFSSOURCE/$SRCPATH/OOo_*_LinuxIntel_install_wJRE_de.tar.gz
|
||||||
|
VERSION=`ls $LFSSOURCE/$SRCPATH/OOo_*_LinuxIntel_install_wJRE_de.tar.gz|awk -F "_" '{print $2}'`
|
||||||
|
fi
|
||||||
cd OOG*
|
cd OOG*
|
||||||
VERSION=`ls $LFSSOURCE/$SRCPATH/OOo*.tar.gz|awk -F "_" '{print $3}'`
|
|
||||||
DSTPKGNAME=OpenOffice-$VERSION
|
DSTPKGNAME=OpenOffice-$VERSION
|
||||||
PKGNAME=$DSTPKGNAME.tbz
|
PKGNAME=$DSTPKGNAME.tbz
|
||||||
}
|
}
|
||||||
|
@ -75,13 +75,8 @@ SRCPATH=X11_2/Office
|
|||||||
|
|
||||||
premk() {
|
premk() {
|
||||||
cd $TMPROOT
|
cd $TMPROOT
|
||||||
if [ ${MK64BIT} == "true" ]; then
|
tar -zxvf $LFSSOURCE/$SRCPATH/OOo_*_[0-9][0-9][0-9][0-9][0-9][0-9]_LinuxIntel_install_de.tar.gz
|
||||||
tar -zxvf $LFSSOURCE/$SRCPATH/OOo_*_unxlngx6_install_de_rpm_64bit.tar.gz
|
VERSION=`ls $LFSSOURCE/$SRCPATH/OOo_*_[0-9][0-9][0-9][0-9][0-9][0-9]_LinuxIntel_install_de.tar.gz|awk -F "_" '{print $2}'`
|
||||||
VERSION=`ls $LFSSOURCE/$SRCPATH/OOo_*_unxlngx6_install_de_rpm_64bit.tar.gz|awk -F "_" '{print $3}'`
|
|
||||||
else
|
|
||||||
tar -zxvf $LFSSOURCE/$SRCPATH/OOO_*_LinuxIntel_install_de.tar.gz
|
|
||||||
VERSION=`ls $LFSSOURCE/$SRCPATH/OOO_*_LinuxIntel_install_de.tar.gz|awk -F "_" '{print $3}'`
|
|
||||||
fi
|
|
||||||
DSTPKGNAME=OxygenOffice-$VERSION
|
DSTPKGNAME=OxygenOffice-$VERSION
|
||||||
PKGNAME=$DSTPKGNAME.tbz
|
PKGNAME=$DSTPKGNAME.tbz
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user