1 files changed, 10 insertions, 14 deletions
diff --git a/system/unar/unar.SlackBuild b/system/unar/unar.SlackBuild
index 61017e129a771..a2c7d2dfcc13c 100644
--- a/system/unar/unar.SlackBuild
+++ b/system/unar/unar.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for <appname>
 
-# Copyright 2016-2017 Alexander Verbovetsky, Moscow, Russia
+# Copyright 2016-2019 Alexander Verbovetsky, Moscow, Russia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=unar
-VERSION=${VERSION:-1.10.1}
+VERSION=${VERSION:-1.10.3}
+SVERSION=${SVERSION:-1.10.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -55,10 +56,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf "The Unarchiver" $PRGNAM-$VERSION
-unzip "$CWD/$PRGNAM$VERSION"_src.zip
-mv "The Unarchiver" $PRGNAM-$VERSION
-cd $PRGNAM-$VERSION
+rm -rf XADMaster UniversalDetector
+unzip $CWD/unar-sources-$SVERSION.zip
+cd XADMaster
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -70,25 +70,21 @@ export CFLAGS="$SLKCFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
 export OBJCFLAGS="$SLKCFLAGS"
 
-cd XADMaster
 make -f Makefile.linux
 
 mkdir -p $PKG/usr/bin
 install -m 0755 -o root -g root lsar unar $PKG/usr/bin/
 
-cd ../Extra
-patch -p2 < $CWD/document-undocumented-options.patch
 mkdir -p $PKG/usr/man/man1
-install -m 0644 -o root -g root lsar.1 unar.1 $PKG/usr/man/man1
+install -m 0644 -o root -g root $CWD/Extra/lsar.1 $CWD/Extra/unar.1 \
+  $PKG/usr/man/man1
 
 mkdir -p $PKG/usr/share/bash-completion/completions
-install -m 0644 -o root -g root unar.bash_completion \
+install -m 0644 -o root -g root $CWD/Extra/unar.bash_completion \
   $PKG/usr/share/bash-completion/completions/unar
-install -m 0644 -o root -g root lsar.bash_completion \
+install -m 0644 -o root -g root $CWD/Extra/lsar.bash_completion \
   $PKG/usr/share/bash-completion/completions/lsar
 
-cd ..
-
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true