wok diff get-LibreOffice/stuff/get-LibreOffice @ rev 9774
bridge-utils: fix WGET_URL and clean
| author | Christophe Lincoln <pankso@slitaz.org> |
|---|---|
| date | Wed May 11 21:31:48 2011 +0200 (2011-05-11) |
| parents | 1e6c96591f33 |
| children | da7a3815bacb |
line diff
1.1 --- a/get-LibreOffice/stuff/get-LibreOffice Thu Jan 27 07:36:43 2011 +0000 1.2 +++ b/get-LibreOffice/stuff/get-LibreOffice Wed May 11 21:31:48 2011 +0200 1.3 @@ -14,12 +14,11 @@ 1.4 1.5 VERSION="$(basename $(wget -O - http://download.documentfoundation.org/libreoffice/$DIR/ \ 1.6 2> /dev/null | grep href=\"[0-9] | tail -1 | sed 's/.*href=\"//;s/[/\">].*//'))" 1.7 - if [ -z "$VERSION" ]; then 1.8 - echo "Can't detect an appropriate version. The version numbering or URL may have changed. 1.9 - Aborted." 1.10 - exit 0 1.11 - fi 1.12 - VER="${VERSION/\-/}" # without hyphens 1.13 +if [ -z "$VERSION" ]; then 1.14 + echo "Can't detect an appropriate version. The version numbering or URL may have changed. Aborted." 1.15 + exit 0 1.16 +fi 1.17 +VER="${VERSION/\-/}" # without hyphens 1.18 1.19 1.20 TARBALL="LibO_${VER}_${SUFFIX}" 1.21 @@ -29,15 +28,15 @@ 1.22 fr_FR|de_DE|es_ES|it_IT|ru_RU) 1.23 LOC=${LANG%_*} # strip 1.24 L_SUFFIX="Linux_x86_langpack-rpm_$LOC.tar.gz" 1.25 - L_TARBALL="LibO_${VER}_${L_SUFFIX}" 1.26 - LANG_URL="http://download.documentfoundation.org/libreoffice/${DIR}/${VERSION}/rpm/x86/${L_TARBALL}" 1.27 - echo "Added $LANG ($LOC)." ;; 1.28 + L_TARBALL="LibO_${VER}_${L_SUFFIX}" 1.29 + LANG_URL="http://download.documentfoundation.org/libreoffice/${DIR}/${VERSION}/rpm/x86/${L_TARBALL}" 1.30 + echo "Added $LANG ($LOC)." ;; 1.31 en_GB|pt_BR) 1.32 - LANG=${LANG/_/-} # convert 1.33 + LANG=${LANG/_/-} # convert 1.34 L_SUFFIX="Linux_x86_langpack-rpm_$LANG.tar.gz" 1.35 - L_TARBALL="LibO_${VER}_${L_SUFFIX}" 1.36 - LANG_URL="http://download.documentfoundation.org/libreoffice/${DIR}/${VERSION}/rpm/x86/${L_TARBALL}" 1.37 - echo "Added $LANG." ;; 1.38 + L_TARBALL="LibO_${VER}_${L_SUFFIX}" 1.39 + LANG_URL="http://download.documentfoundation.org/libreoffice/${DIR}/${VERSION}/rpm/x86/${L_TARBALL}" 1.40 + echo "Added $LANG." ;; 1.41 esac 1.42 1.43 1.44 @@ -103,13 +102,13 @@ 1.45 # Check if we have the tarball before. 1.46 if [ ! -f $SOURCE_DIR/$TARBALL ]; then 1.47 echo "Downloading LibreOffice tarball (it's time to have a break)... " 1.48 - #Check if $SOURCE_DIR exist 1.49 + # Check if $SOURCE_DIR exist 1.50 test -d $SOURCE_DIR || mkdir -p $SOURCE_DIR 1.51 # Get the file. 1.52 wget -c $WGET_URL -O $SOURCE_DIR/$TARBALL 1.53 if [ -n $L_TARBALL ] ; then # Are we localised? 1.54 - wget -c $LANG_URL -O $SOURCE_DIR/$L_TARBALL 1.55 - fi 1.56 + wget -c $LANG_URL -O $SOURCE_DIR/$L_TARBALL 1.57 + fi 1.58 status 1.59 fi 1.60 if [ ! -f $SOURCE_DIR/$TARBALL ]; then 1.61 @@ -123,23 +122,27 @@ 1.62 # Creates TEMP_DIR and extract tarball 1.63 mkdir -p $TEMP_DIR 1.64 for TB in $TARBALL $L_TARBALL ; do 1.65 - tar xvzf $SOURCE_DIR/$TB -C $TEMP_DIR > $LOG 2>&1 || \ 1.66 - (echo "Failed to extract $TB" ; exit 1) 1.67 + tar xvzf $SOURCE_DIR/$TB -C $TEMP_DIR > $LOG 2>&1 || \ 1.68 + (echo "Failed to extract $TB" ; exit 1) 1.69 done 1.70 + 1.71 +# Get version found in archive (often directory is still RC version when final is present) 1.72 +ARCHIVED_VERSION=`find $TEMP_DIR -type d 2> /dev/null | grep LibO | head -n 1 | sed 's/_/ /g' | awk '{print $2}'` 1.73 +echo -n "(found v${ARCHIVED_VERSION})" 1.74 + 1.75 # Consolidate localisations into main package 1.76 if [ -n $L_TARBALL ] ; then # Are we localised? 1.77 -# mv -f $TEMP_DIR/${L_TARBALL/.tar.gz/}/RPMS/*.rpm $TEMP_DIR/${TARBALL/.tar.gz/}/RPMS/ 1.78 - mv -f $TEMP_DIR/LibO_3.3.0rc4_Linux_x86_langpack-rpm_en-GB/RPMS/*.rpm $TEMP_DIR/LibO_3.3.0rc4_Linux_x86_install-rpm_en-US/RPMS/ 1.79 + TARBALL_NAME="${TARBALL/.tar.gz/}" 1.80 + L_TARBALL_NAME="${L_TARBALL/.tar.gz/}" 1.81 + mv -f $TEMP_DIR/${L_TARBALL_NAME/$VERSION/$ARCHIVED_VERSION}/RPMS/*.rpm $TEMP_DIR/${TARBALL_NAME/$VERSION/$ARCHIVED_VERSION}/RPMS/ 1.82 fi 1.83 status 1.84 1.85 # Extracted pkg can be removed: Save RAM 1.86 rm -rf $SOURCE_DIR 1.87 1.88 -# cd $TEMP_DIR/${TARBALL/.tar.gz/}/RPMS 1.89 -cd $TEMP_DIR/LibO_3.3.0rc4_Linux_x86_install-rpm_en-US/RPMS 1.90 - 1.91 # Extract everything from RPMS 1.92 +cd $TEMP_DIR/${TARBALL_NAME/$VERSION/$ARCHIVED_VERSION}/RPMS 1.93 for i in *.rpm 1.94 do 1.95 if (! echo $i | egrep -qi $EXCLUDE); then 1.96 @@ -157,7 +160,7 @@ 1.97 1.98 # Make the package 1.99 mkdir -p $PACKAGE-$VERSION/fs/usr/lib/libreoffice \ 1.100 - $PACKAGE-$VERSION/fs/usr/share 1.101 + $PACKAGE-$VERSION/fs/usr/share 1.102 1.103 # use mv instead of 'cp -a' to save RAM 1.104 mv opt/libreoffice* $PACKAGE-$VERSION/fs/usr/lib 1.105 @@ -182,17 +185,16 @@ 1.106 post_install() 1.107 { 1.108 cd /usr/share/applications 1.109 - ln -s /usr/lib/libreoffice/share/xdg/base.desktop libreoffice-base.desktop 1.110 - ln -s /usr/lib/libreoffice/share/xdg/impress.desktop libreoffice-impress.desktop 1.111 - ln -s /usr/lib/libreoffice/share/xdg/writer.desktop libreoffice-writer.desktop 1.112 - ln -s /usr/lib/libreoffice/share/xdg/calc.desktop libreoffice-calc.desktop 1.113 - ln -s /usr/lib/libreoffice/share/xdg/math.desktop libreoffice-math.desktop 1.114 - ln -s /usr/lib/libreoffice/share/xdg/draw.desktop libreoffice-draw.desktop 1.115 + ln -s /usr/lib/libreoffice/share/xdg/base.desktop libreoffice-base.desktop 1.116 + ln -s /usr/lib/libreoffice/share/xdg/impress.desktop libreoffice-impress.desktop 1.117 + ln -s /usr/lib/libreoffice/share/xdg/writer.desktop libreoffice-writer.desktop 1.118 + ln -s /usr/lib/libreoffice/share/xdg/calc.desktop libreoffice-calc.desktop 1.119 + ln -s /usr/lib/libreoffice/share/xdg/math.desktop libreoffice-math.desktop 1.120 + ln -s /usr/lib/libreoffice/share/xdg/draw.desktop libreoffice-draw.desktop 1.121 ln -s /usr/lib/libreoffice/share/xdg/printeradmin.desktop libreoffice-printeradmin.desktop 1.122 1.123 - 1.124 cd /usr/bin 1.125 - ln -s /usr/lib/libreoffice /usr/lib/libreoffice/libreoffice 1.126 + ln -s /usr/lib/libreoffice /usr/lib/libreoffice/libreoffice 1.127 ln -sf /usr/lib/libreoffice/program/soffice 1.128 } 1.129