wok rev 23888

get-LibreOffice: default version set to 6.2.8.2
author Hans-G?nter Theisgen
date Fri Jul 24 10:20:46 2020 +0100 (5 months ago)
parents 2a47d3b3f4de
children 0bc71e393813
files get-LibreOffice/receipt get-LibreOffice/stuff/get-LibreOffice
line diff
     1.1 --- a/get-LibreOffice/receipt	Fri Jul 17 11:18:27 2020 +0000
     1.2 +++ b/get-LibreOffice/receipt	Fri Jul 24 10:20:46 2020 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="get-LibreOffice"
     1.7 -VERSION="1.3"
     1.8 +VERSION="1.31"
     1.9  CATEGORY="office"
    1.10  TAGS="office word excel ppt openoffice libreoffice"
    1.11  SHORT_DESC="Productivity suite."
    1.12 @@ -14,6 +14,6 @@
    1.13  {
    1.14  	mkdir -p $fs/usr/bin
    1.15  	install -o root -g root -m755 \
    1.16 -		stuff/get-LibreOffice $fs/usr/bin
    1.17 -	ln -s get-LibreOffice $fs/usr/bin/get-libreoffice
    1.18 +		stuff/get-LibreOffice	$fs/usr/bin
    1.19 +	ln -s get-LibreOffice		$fs/usr/bin/get-libreoffice
    1.20  }
     2.1 --- a/get-LibreOffice/stuff/get-LibreOffice	Fri Jul 17 11:18:27 2020 +0000
     2.2 +++ b/get-LibreOffice/stuff/get-LibreOffice	Fri Jul 24 10:20:46 2020 +0100
     2.3 @@ -2,11 +2,12 @@
     2.4  # get-LibreOffice - create and install SliTaz package LibreOffice
     2.5  # excluding KDE and GNOME integration and test suite.
     2.6  #
     2.7 -# (C) 2019 SliTaz - GNU General Public License v3.
     2.8 +# (C) 2020 SliTaz - GNU General Public License v3.
     2.9  # Author : Ben Arnold <ben@seawolfsanctuary.com>
    2.10  #    via : get-OpenOffice3 (Eric Joseph-Alexandre <erjo@slitaz.org>)
    2.11  # modified by Hans-Günter Theisgen on 2019-04-07
    2.12 -# modified by Hans-Günter Theisgen on 220-03-17
    2.13 +# modified by Hans-Günter Theisgen on 2020-03-17
    2.14 +# modified by Hans-Günter Theisgen on 2020-07-24
    2.15  #
    2.16  
    2.17  #	=== Initialisations ===
    2.18 @@ -59,7 +60,9 @@
    2.19  title "Package $PACKAGE will be build as SliTaz package and installed"
    2.20  
    2.21  # Fetch latest $DIR version, unless version is set by option --version
    2.22 -[ -z "$version" ] && version="latest"
    2.23 +#[ -z "$version" ] && version="latest"
    2.24 +[ -z "$version" ] && version="6.2.8.2" &&
    2.25 +  echo "Newer versions than 6.2.8.2 are not available in 32-bit flavour!"
    2.26  
    2.27  # Fetch language pack according to $LANG, unless otherwise set by option --lang
    2.28  [ -z "$lang" ] && lang="automatic"
    2.29 @@ -133,53 +136,53 @@
    2.30  for VERSION in $VERSIONS
    2.31    do	# foreach VERSION
    2.32  
    2.33 -VER="${VERSION/\-/}" # without hyphens
    2.34 -TARBALL="LibreOffice_${VER}_${SUFFIX}"
    2.35 -WGET_URL="$PREFIX/${VERSION}/rpm/x86/${TARBALL}"
    2.36 +	VER="${VERSION/\-/}" # without hyphens
    2.37 +	TARBALL="LibreOffice_${VER}_${SUFFIX}"
    2.38 +	WGET_URL="$PREFIX/${VERSION}/rpm/x86/${TARBALL}"
    2.39  
    2.40 -# Set LANG_URL to fetch language package
    2.41 -if [ "$lang" = "automatic" ]
    2.42 -  then	# use language from $LANG of running process
    2.43 -	for LOC in ${LANG/_/-} ${LANG%_*}
    2.44 -	  do
    2.45 -		L_SUFFIX="Linux_x86_rpm_langpack_$LOC.tar.gz"
    2.46 +	# Set LANG_URL to fetch language package
    2.47 +	if [ "$lang" = "automatic" ]
    2.48 +	  then	# use language from $LANG of running process
    2.49 +		for LOC in ${LANG/_/-} ${LANG%_*}
    2.50 +		  do
    2.51 +			L_SUFFIX="Linux_x86_rpm_langpack_$LOC.tar.gz"
    2.52 +			L_TARBALL="LibreOffice_${VER}_${L_SUFFIX}"
    2.53 +			LANG_URL="$PREFIX/${VERSION}/rpm/x86/${L_TARBALL}"
    2.54 +			busybox wget -s $LANG_URL 2> /dev/null || continue
    2.55 +			echo "Added language pack for $LANG ($LOC)."
    2.56 +			break
    2.57 +		  done
    2.58 +	  else
    2.59 +		L_SUFFIX="Linux_x86_rpm_langpack_$lang.tar.gz"
    2.60  		L_TARBALL="LibreOffice_${VER}_${L_SUFFIX}"
    2.61  		LANG_URL="$PREFIX/${VERSION}/rpm/x86/${L_TARBALL}"
    2.62 -		busybox wget -s $LANG_URL 2> /dev/null || continue
    2.63 -		echo "Added language pack for $LANG ($LOC)."
    2.64 -		break
    2.65 -	  done
    2.66 -  else
    2.67 -	L_SUFFIX="Linux_x86_rpm_langpack_$lang.tar.gz"
    2.68 -	L_TARBALL="LibreOffice_${VER}_${L_SUFFIX}"
    2.69 -	LANG_URL="$PREFIX/${VERSION}/rpm/x86/${L_TARBALL}"
    2.70 -	busybox wget -s $LANG_URL 2> /dev/null &&
    2.71 -	echo "Added language pack for $lang."
    2.72 -fi
    2.73 +		busybox wget -s $LANG_URL 2> /dev/null &&
    2.74 +		echo "Added language pack for $lang."
    2.75 +	fi
    2.76  
    2.77 -CUR_DIR=$(pwd)
    2.78 -mkdir -p $TEMP_DIR
    2.79 -cd $TEMP_DIR
    2.80 +	CUR_DIR=$(pwd)
    2.81 +	mkdir -p $TEMP_DIR
    2.82 +	cd $TEMP_DIR
    2.83  
    2.84 -if [ -f $SOURCE_DIR/$TARBALL ]
    2.85 -  then
    2.86 -	echo "Using existing archive file $TARBALL"
    2.87 -  else
    2.88 -	action "Fetching the archives..."
    2.89 -	newline
    2.90 -	# Check if $SOURCE_DIR exists
    2.91 -	[ -d $SOURCE_DIR ] || mkdir -p $SOURCE_DIR
    2.92 -	wget -c $WGET_URL -O $SOURCE_DIR/$TARBALL || continue
    2.93 -	if [ -n $L_TARBALL ]	 # language pack required?
    2.94 +	if [ -f $SOURCE_DIR/$TARBALL ]
    2.95  	  then
    2.96 -		wget -c $LANG_URL -O $SOURCE_DIR/$L_TARBALL
    2.97 +		echo "Using existing archive file $TARBALL"
    2.98 +	  else
    2.99 +		action "Fetching the archives..."
   2.100 +		newline
   2.101 +		# Check if $SOURCE_DIR exists
   2.102 +		[ -d $SOURCE_DIR ] || mkdir -p $SOURCE_DIR
   2.103 +		wget -c $WGET_URL -O $SOURCE_DIR/$TARBALL || continue
   2.104 +		if [ -n $L_TARBALL ]	 # language pack required?
   2.105 +		  then
   2.106 +			wget -c $LANG_URL -O $SOURCE_DIR/$L_TARBALL
   2.107 +		fi
   2.108 +		status
   2.109  	fi
   2.110 -	status
   2.111 -fi
   2.112  
   2.113 -break
   2.114 +	break
   2.115  
   2.116 -done	# foreach VERSION
   2.117 +  done	# foreach VERSION
   2.118  
   2.119  if [ ! -f $SOURCE_DIR/$TARBALL ]
   2.120    then