SliTaz Repositories

     1.1 --- a/get-LibreOffice/stuff/get-LibreOffice	Sun Mar 15 17:43:47 2020 +0100
     1.2 +++ b/get-LibreOffice/stuff/get-LibreOffice	Tue Mar 17 06:58:18 2020 +0100
     1.3 @@ -6,6 +6,7 @@
     1.4  # Author : Ben Arnold <ben@seawolfsanctuary.com>
     1.5  #    via : get-OpenOffice3 (Eric Joseph-Alexandre <erjo@slitaz.org>)
     1.6  # modified by Hans-Günter Theisgen on 2019-04-07
     1.7 +# modified by Hans-Günter Theisgen on 220-03-17
     1.8  #
     1.9  
    1.10  #	=== Initialisations ===
    1.11 @@ -21,13 +22,13 @@
    1.12  SUFFIX="Linux_x86_rpm.tar.gz"
    1.13  PREFIX="http://download.documentfoundation.org/libreoffice/$DIR"
    1.14  
    1.15 -DEPENDS="java6-jre cups"
    1.16 +DEPENDS="cups"
    1.17  EXCLUDE="kde|gnome|test"
    1.18  
    1.19  # Declare functions check_root, status, ...
    1.20  . /lib/libtaz.sh
    1.21  # and make commandline options (if any) available as variables
    1.22 -
    1.23 +	
    1.24  is_installed()
    1.25  {
    1.26  	 if [ -d $root$PKGS_DB/installed/$PACKAGE ]
    1.27 @@ -88,6 +89,7 @@
    1.28    keep tazpkg     : $keep
    1.29    source directory: $SOURCE_DIR
    1.30    build directory : $TEMP_DIR
    1.31 +  logging file:     $LOG
    1.32  
    1.33  EOT
    1.34  
    1.35 @@ -123,10 +125,13 @@
    1.36  		exit 1
    1.37  	fi
    1.38    else
    1.39 +	DIR="old"
    1.40 +	PREFIX="http://downloadarchive.documentfoundation.org/libreoffice/$DIR"
    1.41  	VERSIONS="$version"
    1.42  fi
    1.43  
    1.44 -for VERSION in $VERSIONS; do	# foreach VERSION
    1.45 +for VERSION in $VERSIONS
    1.46 +  do	# foreach VERSION
    1.47  
    1.48  VER="${VERSION/\-/}" # without hyphens
    1.49  TARBALL="LibreOffice_${VER}_${SUFFIX}"
    1.50 @@ -174,7 +179,7 @@
    1.51  
    1.52  break
    1.53  
    1.54 -done	# foreach VERSIONS
    1.55 +done	# foreach VERSION
    1.56  
    1.57  if [ ! -f $SOURCE_DIR/$TARBALL ]
    1.58    then
    1.59 @@ -322,7 +327,9 @@
    1.60  
    1.61  #	=== Cleanup ===
    1.62  # Preserve package file, if requested
    1.63 -[ "$keep" == "yes" ] && mv $PACKAGE-$VERSION.tazpkg $CUR_DIR
    1.64 +[ "$keep" == "yes" ] &&
    1.65 +( mv $PACKAGE-$VERSION.tazpkg $CUR_DIR &&
    1.66 +  echo Saved $PACKAGE-$VERSION.tazpkg to $CUR_DIR )
    1.67  
    1.68  # Remove temporary build directory
    1.69  cd $CUR_DIR