1 files changed, 14 insertions, 12 deletions
diff --git a/python/thonny/thonny.SlackBuild b/python/thonny/thonny.SlackBuild
index 9ac655d16d..09277e3adf 100644
--- a/python/thonny/thonny.SlackBuild
+++ b/python/thonny/thonny.SlackBuild
@@ -21,13 +21,10 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=thonny
-VERSION=${VERSION:-2.1.16}
+VERSION=${VERSION:-2.1.17}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCNAME="plas-thonny"
-SRCVER="cf381800c445"
-
 ARCH=noarch
 
 CWD=$(pwd)
@@ -40,9 +37,11 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAME-$SRCVER
-unzip $CWD/$SRCNAME-$SRCVER.zip || unzip $CWD/$SRCVER.zip
-cd $SRCNAME-$SRCVER
+rm -rf $PRGNAM
+#thonny comes packaged with a python executable. we don't care which
+#flavour x86/x86_64 as we just extract the (no-arch) python files
+tar -xzf $CWD/$PRGNAM-$VERSION-x86_64.tar.gz
+cd $PRGNAM
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -53,18 +52,21 @@ find -L . \
 install -D -m0755 $CWD/$PRGNAM.sh $PKG/usr/bin/$PRGNAM
 
 mkdir -p $PKG/opt/$PRGNAM
-cp -r $PRGNAM/* $PKG/opt/$PRGNAM
+cp -r lib/python3.6/site-packages/$PRGNAM/* $PKG/opt/$PRGNAM
 
 mkdir -p $PKG/usr/share/applications
-cp -a packaging/linux/org.$PRGNAM.Thonny.desktop $PKG/usr/share/applications/$PRGNAM.desktop
+#patch desktop file to point to correct places.
+sed -i "/^Exec/c\Exec=\/usr\/bin\/thonny %F" templates/Thonny.desktop
+sed -i "/^Icon/c\Icon=thonny.png" templates/Thonny.desktop
+cp -a templates/Thonny.desktop $PKG/usr/share/applications/$PRGNAM.desktop
 
 mkdir -p $PKG/usr/share/pixmaps
-cp -a packaging/icons/$PRGNAM-128x128.png $PKG/usr/share/pixmaps/$PRGNAM.png
+cp -a lib/python3.6/site-packages/thonny/res/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  CHANGELOG.rst LICENSE.txt CONTRIBUTING.rst CREDITS.rst README.rst \
+cp -a lib/python3.6/site-packages/thonny-2.1.17.dist-info/DESCRIPTION.rst \
   $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE.txt  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install