# HG changeset patch # User Hans-G?nter Theisgen # Date 1595582446 -3600 # Node ID 2781677bb5399df92db40911f70b223923ddd049 # Parent 2a47d3b3f4def413ef85ea79f80bafe2453addbe get-LibreOffice: default version set to 6.2.8.2 diff -r 2a47d3b3f4de -r 2781677bb539 get-LibreOffice/receipt --- a/get-LibreOffice/receipt Fri Jul 17 11:18:27 2020 +0000 +++ b/get-LibreOffice/receipt Fri Jul 24 10:20:46 2020 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="get-LibreOffice" -VERSION="1.3" +VERSION="1.31" CATEGORY="office" TAGS="office word excel ppt openoffice libreoffice" SHORT_DESC="Productivity suite." @@ -14,6 +14,6 @@ { mkdir -p $fs/usr/bin install -o root -g root -m755 \ - stuff/get-LibreOffice $fs/usr/bin - ln -s get-LibreOffice $fs/usr/bin/get-libreoffice + stuff/get-LibreOffice $fs/usr/bin + ln -s get-LibreOffice $fs/usr/bin/get-libreoffice } diff -r 2a47d3b3f4de -r 2781677bb539 get-LibreOffice/stuff/get-LibreOffice --- a/get-LibreOffice/stuff/get-LibreOffice Fri Jul 17 11:18:27 2020 +0000 +++ b/get-LibreOffice/stuff/get-LibreOffice Fri Jul 24 10:20:46 2020 +0100 @@ -2,11 +2,12 @@ # get-LibreOffice - create and install SliTaz package LibreOffice # excluding KDE and GNOME integration and test suite. # -# (C) 2019 SliTaz - GNU General Public License v3. +# (C) 2020 SliTaz - GNU General Public License v3. # Author : Ben Arnold # via : get-OpenOffice3 (Eric Joseph-Alexandre ) # modified by Hans-Günter Theisgen on 2019-04-07 -# modified by Hans-Günter Theisgen on 220-03-17 +# modified by Hans-Günter Theisgen on 2020-03-17 +# modified by Hans-Günter Theisgen on 2020-07-24 # # === Initialisations === @@ -59,7 +60,9 @@ title "Package $PACKAGE will be build as SliTaz package and installed" # Fetch latest $DIR version, unless version is set by option --version -[ -z "$version" ] && version="latest" +#[ -z "$version" ] && version="latest" +[ -z "$version" ] && version="6.2.8.2" && + echo "Newer versions than 6.2.8.2 are not available in 32-bit flavour!" # Fetch language pack according to $LANG, unless otherwise set by option --lang [ -z "$lang" ] && lang="automatic" @@ -133,53 +136,53 @@ for VERSION in $VERSIONS do # foreach VERSION -VER="${VERSION/\-/}" # without hyphens -TARBALL="LibreOffice_${VER}_${SUFFIX}" -WGET_URL="$PREFIX/${VERSION}/rpm/x86/${TARBALL}" + VER="${VERSION/\-/}" # without hyphens + TARBALL="LibreOffice_${VER}_${SUFFIX}" + WGET_URL="$PREFIX/${VERSION}/rpm/x86/${TARBALL}" -# Set LANG_URL to fetch language package -if [ "$lang" = "automatic" ] - then # use language from $LANG of running process - for LOC in ${LANG/_/-} ${LANG%_*} - do - L_SUFFIX="Linux_x86_rpm_langpack_$LOC.tar.gz" + # Set LANG_URL to fetch language package + if [ "$lang" = "automatic" ] + then # use language from $LANG of running process + for LOC in ${LANG/_/-} ${LANG%_*} + do + L_SUFFIX="Linux_x86_rpm_langpack_$LOC.tar.gz" + L_TARBALL="LibreOffice_${VER}_${L_SUFFIX}" + LANG_URL="$PREFIX/${VERSION}/rpm/x86/${L_TARBALL}" + busybox wget -s $LANG_URL 2> /dev/null || continue + echo "Added language pack for $LANG ($LOC)." + break + done + else + L_SUFFIX="Linux_x86_rpm_langpack_$lang.tar.gz" L_TARBALL="LibreOffice_${VER}_${L_SUFFIX}" LANG_URL="$PREFIX/${VERSION}/rpm/x86/${L_TARBALL}" - busybox wget -s $LANG_URL 2> /dev/null || continue - echo "Added language pack for $LANG ($LOC)." - break - done - else - L_SUFFIX="Linux_x86_rpm_langpack_$lang.tar.gz" - L_TARBALL="LibreOffice_${VER}_${L_SUFFIX}" - LANG_URL="$PREFIX/${VERSION}/rpm/x86/${L_TARBALL}" - busybox wget -s $LANG_URL 2> /dev/null && - echo "Added language pack for $lang." -fi + busybox wget -s $LANG_URL 2> /dev/null && + echo "Added language pack for $lang." + fi -CUR_DIR=$(pwd) -mkdir -p $TEMP_DIR -cd $TEMP_DIR + CUR_DIR=$(pwd) + mkdir -p $TEMP_DIR + cd $TEMP_DIR -if [ -f $SOURCE_DIR/$TARBALL ] - then - echo "Using existing archive file $TARBALL" - else - action "Fetching the archives..." - newline - # Check if $SOURCE_DIR exists - [ -d $SOURCE_DIR ] || mkdir -p $SOURCE_DIR - wget -c $WGET_URL -O $SOURCE_DIR/$TARBALL || continue - if [ -n $L_TARBALL ] # language pack required? + if [ -f $SOURCE_DIR/$TARBALL ] then - wget -c $LANG_URL -O $SOURCE_DIR/$L_TARBALL + echo "Using existing archive file $TARBALL" + else + action "Fetching the archives..." + newline + # Check if $SOURCE_DIR exists + [ -d $SOURCE_DIR ] || mkdir -p $SOURCE_DIR + wget -c $WGET_URL -O $SOURCE_DIR/$TARBALL || continue + if [ -n $L_TARBALL ] # language pack required? + then + wget -c $LANG_URL -O $SOURCE_DIR/$L_TARBALL + fi + status fi - status -fi -break + break -done # foreach VERSION + done # foreach VERSION if [ ! -f $SOURCE_DIR/$TARBALL ] then