wok-next rev 18870
get-skype: fix skype.desktop moving/copying problem
use busybox wget as more predictable
use busybox wget as more predictable
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Wed Feb 03 18:54:47 2016 +0200 (2016-02-03) |
parents | c75265fb6c4b |
children | 77a6f66653ab |
files | get-skype/stuff/get-skype |
line diff
1.1 --- a/get-skype/stuff/get-skype Wed Feb 03 17:03:06 2016 +0100 1.2 +++ b/get-skype/stuff/get-skype Wed Feb 03 18:54:47 2016 +0200 1.3 @@ -23,21 +23,21 @@ 1.4 # Download tarball 1.5 WEB_SITE="http://www.skype.com/" 1.6 TARBALL="getskype-linux-beta-dynamic" 1.7 -wget ${WEB_SITE}go/$TARBALL 1.8 -if [ ! -f $TARBALL ]; then 1.9 - echo "Could not download $TARBALL. Exiting." 1.10 +busybox wget -O $TARBALL.tar.bz2 ${WEB_SITE}go/$TARBALL 1.11 +if [ ! -f $TARBALL.tar.bz2 ]; then 1.12 + echo "Could not download tarball. Exiting." 1.13 exit 1 1.14 fi 1.15 1.16 # Extract 1.17 -TARBALL=$(ls $TARBALL skype*.tar.bz2 2> /dev/null || true) 1.18 -tar xjf $TARBALL 1.19 +#TARBALL=$(ls $TARBALL skype*.tar.bz2 2> /dev/null || true) 1.20 +tar -xjf $TARBALL.tar.bz2 1.21 VERSION=$(ls -d skype-*) 1.22 VERSION=${VERSION%/} 1.23 VERSION=${VERSION#skype-*} 1.24 1.25 # extracted pkg can be removed: Save RAM 1.26 -rm -f $TARBALL 1.27 +rm -f $TARBALL.tar.bz2 1.28 1.29 cd skype-$VERSION 1.30 1.31 @@ -53,7 +53,7 @@ 1.32 mv avatars skype-$VERSION/fs/usr/share/skype 1.33 mv sounds skype-$VERSION/fs/usr/share/skype 1.34 mv skype.conf skype-$VERSION/fs/etc 1.35 -mv skype.desktop skype-$VERSION/fs/usr/share/applications 1.36 +cp skype.desktop skype-$VERSION/fs/usr/share/applications 1.37 cp skype.desktop skype-$VERSION/fs/usr/share/applications/skype.desktop 1.38 mv skype.desktop skype-$VERSION/fs/usr/share/applications/skype-pulse.desktop 1.39 sed 's|Exec=|TryExec=apulse\nExec=apulse |' -i skype-$VERSION/fs/usr/share/applications/skype.desktop 1.40 @@ -98,7 +98,7 @@ 1.41 EOT 1.42 1.43 # Pack 1.44 -tazpkg pack skype-$VERSION 1.45 +tazpkg pack skype-$VERSION gzip 1.46 1.47 # Clean to save RAM memory 1.48 rm -rf $PACKAGE-$VERSION