diff options
| -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} |