# HG changeset patch # User Aleksej Bobylev # Date 1454518487 -7200 # Node ID 634b0d5e373d8f560d2af64624d1d16be14cf122 # Parent c75265fb6c4bf5def4a3fb9067f32e64a4d9d4a4 get-skype: fix skype.desktop moving/copying problem use busybox wget as more predictable diff -r c75265fb6c4b -r 634b0d5e373d get-skype/stuff/get-skype --- a/get-skype/stuff/get-skype Wed Feb 03 17:03:06 2016 +0100 +++ b/get-skype/stuff/get-skype Wed Feb 03 18:54:47 2016 +0200 @@ -23,21 +23,21 @@ # Download tarball WEB_SITE="http://www.skype.com/" TARBALL="getskype-linux-beta-dynamic" -wget ${WEB_SITE}go/$TARBALL -if [ ! -f $TARBALL ]; then - echo "Could not download $TARBALL. Exiting." +busybox wget -O $TARBALL.tar.bz2 ${WEB_SITE}go/$TARBALL +if [ ! -f $TARBALL.tar.bz2 ]; then + echo "Could not download tarball. Exiting." exit 1 fi # Extract -TARBALL=$(ls $TARBALL skype*.tar.bz2 2> /dev/null || true) -tar xjf $TARBALL +#TARBALL=$(ls $TARBALL skype*.tar.bz2 2> /dev/null || true) +tar -xjf $TARBALL.tar.bz2 VERSION=$(ls -d skype-*) VERSION=${VERSION%/} VERSION=${VERSION#skype-*} # extracted pkg can be removed: Save RAM -rm -f $TARBALL +rm -f $TARBALL.tar.bz2 cd skype-$VERSION @@ -53,7 +53,7 @@ mv avatars skype-$VERSION/fs/usr/share/skype mv sounds skype-$VERSION/fs/usr/share/skype mv skype.conf skype-$VERSION/fs/etc -mv skype.desktop skype-$VERSION/fs/usr/share/applications +cp skype.desktop skype-$VERSION/fs/usr/share/applications cp skype.desktop skype-$VERSION/fs/usr/share/applications/skype.desktop mv skype.desktop skype-$VERSION/fs/usr/share/applications/skype-pulse.desktop sed 's|Exec=|TryExec=apulse\nExec=apulse |' -i skype-$VERSION/fs/usr/share/applications/skype.desktop @@ -98,7 +98,7 @@ EOT # Pack -tazpkg pack skype-$VERSION +tazpkg pack skype-$VERSION gzip # Clean to save RAM memory rm -rf $PACKAGE-$VERSION