diff options
| author |   David Spencer <idlemoor@slackbuilds.org> | 2017-08-06 01:06:17 +0100 |
|---|---|---|
| committer |   Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2017-08-12 06:57:27 +0700 |
| commit | ed8144d8154a3ea2a9907976fd179db421353cbe (patch) | |
| tree | 5997b6ce0c40d1d01b5188af4b373ca8186a4f13 /system | |
| parent | a56435e369061807c04e8c6640a80d114994705b (diff) | |
| download | slackbuilds-ed8144d8154a3ea2a9907976fd179db421353cbe.tar.gz slackbuilds-ed8144d8154a3ea2a9907976fd179db421353cbe.tar.xz | |
system/nvme-cli: Fix install path, remove doinst.sh.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'system')
| -rw-r--r-- | system/nvme-cli/doinst.sh | 14 | ||||
| -rw-r--r-- | system/nvme-cli/nvme-cli.SlackBuild | 3 |
2 files changed, 2 insertions, 15 deletions
diff --git a/system/nvme-cli/doinst.sh b/system/nvme-cli/doinst.sh deleted file mode 100644 index b5a41d1d89..0000000000 --- a/system/nvme-cli/doinst.sh +++ /dev/null @@ -1,14 +0,0 @@ -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - -config etc/bash_completion.d/nvme.new diff --git a/system/nvme-cli/nvme-cli.SlackBuild b/system/nvme-cli/nvme-cli.SlackBuild index 07e9d71b0b..ab4b0c9ef7 100644 --- a/system/nvme-cli/nvme-cli.SlackBuild +++ b/system/nvme-cli/nvme-cli.SlackBuild @@ -65,6 +65,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +sed -i -e 's#bash_completion.d#bash_completion.d/completions#' Makefile + make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" PREFIX=/usr make install DESTDIR=$PKG PREFIX=/usr SBINDIR=/usr/sbin @@ -83,7 +85,6 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install 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} |