# HG changeset patch # User Pascal Bellard # Date 1426847776 -3600 # Node ID d11fd3e3b9d378ebe6da046e2467f7a5e8dff041 # Parent 019e831466f713b69c360338052469cce861475b Update get-teamviewer (thanks llev) diff -r 019e831466f7 -r d11fd3e3b9d3 get-LibreOffice/stuff/get-LibreOffice --- a/get-LibreOffice/stuff/get-LibreOffice Tue Mar 17 18:44:10 2015 +0100 +++ b/get-LibreOffice/stuff/get-LibreOffice Fri Mar 20 11:36:16 2015 +0100 @@ -168,7 +168,7 @@ mv usr/bin $PACKAGE-$VERSION/fs/usr # relocalized libexec directory -bin=$(ls $PACKAGE-$VERSION/fs/usr/bin/libreoffice???) +bin=$(echo $PACKAGE-$VERSION/fs/usr/bin/libreoffice???) if [ -L $bin ]; then target=$(readlink $bin) rm -f $bin diff -r 019e831466f7 -r d11fd3e3b9d3 get-teamviewer/stuff/get-teamviewer --- a/get-teamviewer/stuff/get-teamviewer Tue Mar 17 18:44:10 2015 +0100 +++ b/get-teamviewer/stuff/get-teamviewer Fri Mar 20 11:36:16 2015 +0100 @@ -2,7 +2,7 @@ PACKAGE="teamviewer" WEB_SITE="http://www.$PACKAGE.com/" -URL=${WEB_SITE}download/${PACKAGE}_linux.deb +URL=${WEB_SITE}en/download/linux.aspx DEPENDS="bash alsa-lib zlib xorg-libXext" ROOT="$1" [ -d "$ROOT" ] || ROOT="" @@ -24,6 +24,7 @@ mkdir -p $TMP_DIR && cd $TMP_DIR # Download deb +URL=$(wget -O - $URL | sed '/i386/!d;s/.*"\([^"]*i386[^"]*\).*/\1/') wget $URL FILE=$(basename $URL) @@ -48,12 +49,15 @@ mv $PACKAGE $PACKAGE-$VERSION cd $PACKAGE-$VERSION/fs -ln -s $(cd usr/bin ; ls $PACKAGE*) usr/bin/$PACKAGE 2> /dev/null || true +[ -e usr/bin/$PACKAGE ] || +ln -s $(cd usr/bin ; ls $PACKAGE* 2> /dev/null) \ + usr/bin/$PACKAGE 2> /dev/null || true mkdir -p usr/share/applications sed "s|EXEC|/usr/bin/$PACKAGE|g;s!ICON!/$(find opt | grep $PACKAGE.png)!g" \ < $(find opt | grep -E '(desktop.template|\.desktop$)') \ > usr/share/applications/$PACKAGE.desktop -sed -i 's/readlink -e/readlink $0 || echo /' $(find opt | grep /$PACKAGE$) +sed -i 's/readlink -e/readlink $0 || echo /' \ + $(find opt -type f | grep /$PACKAGE$) cd ../.. cat > $PACKAGE-$VERSION/receipt <