get-scripts diff libreoffice @ 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/libreoffice	Sat Apr 23 17:50:46 2016 +0200
     1.2 +++ b/libreoffice	Fri Jun 16 02:55:30 2017 -0400
     1.3 @@ -3,14 +3,6 @@
     1.4  CATEGORY="office"
     1.5  LICENSE="LGPL3"
     1.6  # end of get.list data
     1.7 -#!/bin/sh
     1.8 -# get-LibreOffice - install LibreOffice excl. KDE/Gnome integration & test suite.
     1.9 -#
    1.10 -# (C) 2010 SliTaz - GNU General Public License v3.
    1.11 -# Author : Ben Arnold <ben@seawolfsanctuary.com>
    1.12 -#    via : get-OpenOffice3 (Eric Joseph-Alexandre <erjo@slitaz.org>)
    1.13 -#
    1.14 -
    1.15  PACKAGE="LibreOffice"
    1.16  DEPENDS="cups"
    1.17  SUGGESTED="java6-jre"
    1.18 @@ -60,7 +52,7 @@
    1.19  fi
    1.20  if [ ! -f $SOURCE_DIR/$TARBALL ]; then
    1.21  	rm -rf $SOURCE_DIR
    1.22 -	abort_package "Could not download $TARBALL. Exiting."
    1.23 +	abort_package
    1.24  fi
    1.25  
    1.26  echo -n "Extracting files (this may take a while): "
    1.27 @@ -105,16 +97,16 @@
    1.28  echo -n "Preparing package... "
    1.29  
    1.30  # Make the package
    1.31 -mkdir -p $PACKAGE-$VERSION/fs/usr/lib $PACKAGE-$VERSION/fs/usr/share
    1.32 +USR=$PACKAGE-$VERSION/fs/usr
    1.33 +mkdir -p $USR/lib $USR/share
    1.34  
    1.35  # use mv instead of 'cp -a' to save RAM
    1.36 -mv opt/libreoffice* $PACKAGE-$VERSION/fs/usr/lib/libreoffice
    1.37 -mv usr/share/mime $PACKAGE-$VERSION/fs/usr/share
    1.38 -mv usr/share/icons $PACKAGE-$VERSION/fs/usr/share
    1.39 -mv usr/bin $PACKAGE-$VERSION/fs/usr
    1.40 +mv opt/libreoffice* $USR/lib/libreoffice
    1.41 +mv usr/share/mime usr/share/icons $USR/share
    1.42 +mv usr/bin $USR
    1.43  
    1.44  # relocalized libexec directory
    1.45 -bin=$(echo $PACKAGE-$VERSION/fs/usr/bin/libreoffice${VERSION%.*})
    1.46 +bin=$(echo $USR/bin/libreoffice${VERSION%.*})
    1.47  if [ -L $bin ]; then
    1.48  	target=$(readlink $bin)
    1.49  	rm -f $bin
    1.50 @@ -160,5 +152,3 @@
    1.51  
    1.52  EOT
    1.53  status
    1.54 -[ "$PWD" != "$tmp_dir" ] && mv $PACKAGE-$VERSION $tmp_dir || true
    1.55 -cd $tmp_dir