diff options
Diffstat (limited to 'system/makepasswd/makepasswd.SlackBuild')
-rw-r--r-- | system/makepasswd/makepasswd.SlackBuild | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/system/makepasswd/makepasswd.SlackBuild b/system/makepasswd/makepasswd.SlackBuild index cf6133605a..70598ed123 100644 --- a/system/makepasswd/makepasswd.SlackBuild +++ b/system/makepasswd/makepasswd.SlackBuild @@ -1,10 +1,10 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for makepasswd # Originally written by Pablo Santamaria (email removed) -# Now maintained by B. Watson <yalhcru@gmail.com>. Original version +# Now maintained by B. Watson <urchlay@slackware.uk>. Original version # had no license, modified version released under the WTFPL. See # http://www.wtfpl.net/txt/copying/ for details. @@ -17,10 +17,13 @@ # - install HTML doc to /usr/doc/$PRGNAM-$VERSION, not /usr/man/html1 # - script cosmetic cleanups +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=makepasswd VERSION=${VERSION:-0.5.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -30,7 +33,11 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -60,11 +67,8 @@ rm -rf $TARNAM tar xvf $CWD/$TARNAM.tar.gz cd $TARNAM chown -R root:root . -find -L . \ - \( -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 {} \; +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ make CFLAGS="$SLKCFLAGS" make PREFIX=$PKG/usr DATADIR=$PKG/usr MANDIR=$PKG/usr/man install @@ -80,4 +84,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE |