1 files changed, 14 insertions, 12 deletions
diff --git a/network/frostwire/frostwire.SlackBuild b/network/frostwire/frostwire.SlackBuild
index 275ffcb07f..cbc0314289 100644
--- a/network/frostwire/frostwire.SlackBuild
+++ b/network/frostwire/frostwire.SlackBuild
@@ -27,11 +27,12 @@
 # Updated for new version - Edward Koenig <kingbeowulf@gmail.com>
 
 PRGNAM=frostwire
-VERSION=5.1.4
-ARCH=noarch	# Leave this alone for frostwire
+VERSION=5.2.11
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+ARCH=noarch	# Leave this alone for frostwire
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -41,9 +42,12 @@ set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG/opt $OUTPUT
-cd $PKG/opt
-tar xvf $CWD/$PRGNAM-$VERSION.$ARCH.tar.gz
-mv $PRGNAM-$VERSION.$ARCH $PRGNAM-$VERSION
+
+tar xvf $CWD/$PRGNAM-$VERSION.$ARCH.tar.gz -C $PKG/opt
+mv $PKG/opt/$PRGNAM-$VERSION.$ARCH $PKG/opt/$PRGNAM-$VERSION
+
+# Fix to correctly find version from "java -version"
+patch -p0 -d $PKG/opt/$PRGNAM-$VERSION < $CWD/frostwire_checkjava.diff
 
 mkdir -p $PKG/usr/bin
 cat << EOF > $PKG/usr/bin/$PRGNAM
@@ -53,7 +57,7 @@ cd /opt/frostwire
 EOF
 chmod 0755 $PKG/usr/bin/$PRGNAM
 
-ln -s $PRGNAM-$VERSION $PRGNAM
+ln -s $PRGNAM-$VERSION $PKG/opt/$PRGNAM
 
 # Install desktop file and icon
 install -D -m 0644 $PKG/opt/$PRGNAM-$VERSION/$PRGNAM.desktop \
@@ -64,11 +68,9 @@ install -D -m 0644 $CWD/$PRGNAM.png \
 # Let's not move the docs, as there aren't any, but we will add the build script to them
 install -D -m 0644 $CWD/$PRGNAM.SlackBuild \
   $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-( cd $PKG/usr/doc/$PRGNAM-$VERSION
-  for FILE in COPYING EULA.txt changelog; do
-    ln -s /opt/$PRGNAM-$VERSION/$FILE $FILE ;
-  done
-)
+for FILE in COPYING EULA.txt changelog; do
+  ln -s /opt/$PRGNAM-$VERSION/$FILE $PKG/usr/doc/$PRGNAM-$VERSION/$FILE ;
+done
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
@@ -78,4 +80,4 @@ cd $PKG
 chown -R root:root .
 chmod -R a-s,u+rw,go+r-w .
 find . -type d -name '.svn' | xargs rm -rf
-/sbin/makepkg -c n -l y $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -c n -l y $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}