wok diff get-LibreOffice/stuff/get-LibreOffice @ rev 22315

updated xtrkcad and xtrkcad-dev (4.0.3a1 -> 5.1.2a)
author Hans-G?nter Theisgen
date Thu Nov 14 11:00:47 2019 +0100 (2019-11-14)
parents e12ece9707c2
children 57a7405e48e5
line diff
     1.1 --- a/get-LibreOffice/stuff/get-LibreOffice	Sun Jun 09 11:37:02 2019 +0200
     1.2 +++ b/get-LibreOffice/stuff/get-LibreOffice	Thu Nov 14 11:00:47 2019 +0100
     1.3 @@ -115,17 +115,19 @@
     1.4  
     1.5  if [ "$version" == "latest" ]
     1.6    then
     1.7 -	VERSION="$(basename $(wget -O - $PREFIX/ 2> /dev/null | \
     1.8 -	sed '/href=\"[0-9]/!d;s/.*href=\"//;s/[/\">].*//' | tail -1))"
     1.9 -	if [ -z "$VERSION" ]
    1.10 +	VERSIONS="$(wget -qO - $PREFIX/ | \
    1.11 +		sed '/href=\"[0-9]/!d;s/.*href=\"//;s/[/\">].*//' | tac)"
    1.12 +	if [ -z "$VERSIONS" ]
    1.13  	  then
    1.14  		echo "Can't detect an appropriate version. The version numbering or URL may have changed. Exiting."
    1.15  		exit 1
    1.16  	fi
    1.17    else
    1.18 -	VERSION="$version"
    1.19 +	VERSIONS="$version"
    1.20  fi
    1.21  
    1.22 +for VERSION in $VERSIONS; do	# foreach VERSION
    1.23 +
    1.24  VER="${VERSION/\-/}" # without hyphens
    1.25  TARBALL="LibreOffice_${VER}_${SUFFIX}"
    1.26  WGET_URL="$PREFIX/${VERSION}/rpm/x86/${TARBALL}"
    1.27 @@ -162,7 +164,7 @@
    1.28  	newline
    1.29  	# Check if $SOURCE_DIR exists
    1.30  	[ -d $SOURCE_DIR ] || mkdir -p $SOURCE_DIR
    1.31 -	wget -c $WGET_URL -O $SOURCE_DIR/$TARBALL
    1.32 +	wget -c $WGET_URL -O $SOURCE_DIR/$TARBALL || continue
    1.33  	if [ -n $L_TARBALL ]	 # language pack required?
    1.34  	  then
    1.35  		wget -c $LANG_URL -O $SOURCE_DIR/$L_TARBALL
    1.36 @@ -170,6 +172,10 @@
    1.37  	status
    1.38  fi
    1.39  
    1.40 +break
    1.41 +
    1.42 +done	# foreach VERSIONS
    1.43 +
    1.44  if [ ! -f $SOURCE_DIR/$TARBALL ]
    1.45    then
    1.46  	rm -rf $SOURCE_DIR