get-scripts diff openoffice3 @ rev 69

palemoon: fix VERSION
author Richard Dunbar <mojo@slitaz.org>
date Fri Jun 16 02:55:30 2017 -0400 (2017-06-16)
parents b2587daaa4e6
children ebbc906a623e
line diff
     1.1 --- a/openoffice3	Sat Apr 23 17:50:46 2016 +0200
     1.2 +++ b/openoffice3	Fri Jun 16 02:55:30 2017 -0400
     1.3 @@ -3,13 +3,6 @@
     1.4  CATEGORY="office"
     1.5  LICENSE="Apache"
     1.6  # end of get.list data
     1.7 -#!/bin/sh
     1.8 -# get-OpenOffice3, install everything for OpenOffice.org exept KDE/Gnome integration and testsuite.
     1.9 -#
    1.10 -# (C) 2008 SliTaz - GNU General Public License v3.
    1.11 -#
    1.12 -# Author : Eric Joseph-Alexandre <erjo@slitaz.org>
    1.13 -
    1.14  PACKAGE="OpenOffice3"
    1.15  PATTERN="Linux_x86_install-rpm"
    1.16  
    1.17 @@ -38,9 +31,7 @@
    1.18  	break
    1.19  done
    1.20  
    1.21 -if [ -z "$VERSION" ]; then
    1.22 -	abort_package "Can't find VERSION. Abort."
    1.23 -fi
    1.24 +[ "$VERSION" ] || abort_package "Can't find VERSION. Abort."
    1.25  echo "Selecting $DIR version $VERSION ..."
    1.26  TARBALL="$(wget -O - $MIRROR/$DIR/$VERSION/ \
    1.27  	2> /dev/null | grep $PATTERN | tail -1 | sed 's/.*href=\"\(.*\)\".*/\1/')"
    1.28 @@ -64,7 +55,7 @@
    1.29  fi
    1.30  if [ ! -f $SOURCE_DIR/$TARBALL ]; then
    1.31  	rm -rf $SOURCE_DIR
    1.32 -	abort_package "Could not download $TARBALL. Exiting."
    1.33 +	abort_package
    1.34  fi
    1.35  
    1.36  # Creates TEMP_DIR and extract tarball
    1.37 @@ -93,17 +84,16 @@
    1.38  
    1.39  
    1.40  # Make the package
    1.41 -mkdir -p $PACKAGE-$VERSION/fs/usr/lib/openoffice  \
    1.42 -  $PACKAGE-$VERSION/fs/usr/share
    1.43 +USR=$PACKAGE-$VERSION/fs/usr
    1.44 +mkdir -p $USR/lib/openoffice $USR/share
    1.45  
    1.46  # use mv instead of 'cp -a' to save RAM
    1.47 -mv opt/openoffice* $PACKAGE-$VERSION/fs/usr/lib/openoffice
    1.48 -mv usr/share/mime $PACKAGE-$VERSION/fs/usr/share
    1.49 -mv usr/share/icons $PACKAGE-$VERSION/fs/usr/share
    1.50 -mv usr/bin $PACKAGE-$VERSION/fs/usr
    1.51 +mv opt/openoffice* $USR/lib/openoffice
    1.52 +mv usr/share/mime usr/share/icons $USR/share
    1.53 +mv usr/bin $USR
    1.54  
    1.55  # relocalized OOo libexec directory
    1.56 -sed -i 's#/opt/#/usr/lib/openoffice/#'  $PACKAGE-$VERSION/fs/usr/bin/openoffice*
    1.57 +sed -i 's#/opt/#/usr/lib/openoffice/#'  $USR/bin/openoffice*
    1.58  
    1.59  # Create receipt
    1.60  cat > $PACKAGE-$VERSION/receipt <<EOT
    1.61 @@ -168,5 +158,3 @@
    1.62  		mv $1/fs/$file $(dirname $ROOT/$file)
    1.63  	done
    1.64  }
    1.65 -[ "$PWD" != "$tmp_dir" ] && mv $PACKAGE-$VERSION $tmp_dir || true
    1.66 -cd $tmp_dir