1 files changed, 14 insertions, 9 deletions
diff --git a/network/sqlmap/sqlmap.SlackBuild b/network/sqlmap/sqlmap.SlackBuild
index dc509f8c30..90281cc73e 100644
--- a/network/sqlmap/sqlmap.SlackBuild
+++ b/network/sqlmap/sqlmap.SlackBuild
@@ -1,8 +1,9 @@
 #!/bin/sh
 
 # Slackware build script for sqlmap.
-#
+
 # Copyright 2010-2011 Marco Bonetti <sid77@slackware.it>
+# Copyright 2015 Brenton Earl <brent@exitstatusone.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -40,24 +41,28 @@ mkdir -p $TMP $PKG $OUTPUT
 
 # Install sqlmap in /opt
 mkdir -p $PKG/opt
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -C $PKG/opt
-cd $PKG/opt/$PRGNAM
-chown -R root:root .
-find -L . \
+tar xvf $CWD/$VERSION.tar.gz -C $PKG/opt
+chown -R root:root $PKG/opt/$PRGNAM-$VERSION
+find -L $PKG/opt/$PRGNAM-$VERSION \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
  -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
+
+# Make the wrapper script less prone to maintainer forgetfulness...
+ln -s $PRGNAM-$VERSION $PKG/opt/$PRGNAM
+
 # rename sqlmap.conf
-mv sqlmap.conf sqlmap.conf.new
+mv $PKG/opt/$PRGNAM-$VERSION/sqlmap.conf $PKG/opt/$PRGNAM-$VERSION/sqlmap.conf.new
 
 # Install an application launcher
 mkdir -p $PKG/usr/bin
 install -m 0755 $CWD/sqlmap $PKG/usr/bin/
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $PKG/opt/$PRGNAM/doc/COPYING $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $PKG/opt/$PRGNAM/doc/README.html $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/opt/$PRGNAM-$VERSION/doc/* $PKG/usr/doc/$PRGNAM-$VERSION
+rmdir $PKG/opt/$PRGNAM-$VERSION/doc
+ln -s /usr/doc/$PRGNAM-$VERSION $PKG/opt/$PRGNAM-$VERSION/doc
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -65,4 +70,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}