diff options
| author | B. Watson <yalhcru@gmail.com> | 2022-04-11 23:16:35 -0400 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-04-16 12:11:21 +0700 |
| commit | 710df447af40331a6134e4c9bf0c81b31d8a498a (patch) | |
| tree | eb2c50fbd3786fd542ea9689bd41945f52cfa518 | |
| parent | 45689a0fd0ac355ec18a63e5ebd64e043cb7a13c (diff) | |
system/hdapsd: Don't step on existing config file.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | system/hdapsd/hdapsd.SlackBuild | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/system/hdapsd/hdapsd.SlackBuild b/system/hdapsd/hdapsd.SlackBuild index 4e3cca200975..d47df0fd5b56 100644 --- a/system/hdapsd/hdapsd.SlackBuild +++ b/system/hdapsd/hdapsd.SlackBuild @@ -27,25 +27,26 @@ # Modified by Robby Workman <rworkman@slackbuilds.org> # Updated by Antonio Hernández Blas <hba.nihilismus@gmail.com> for hdapsd-20090401 +# 20220411 bkw: Modified by SlackBuilds.org, BUILD=2: +# - don't install /etc/hdapsd.conf (only the .new one). +# - i486 => i586. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=hdapsd VERSION=${VERSION:-20141203} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -55,8 +56,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -80,9 +81,9 @@ cd $PRGNAM-$VERSION 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 \ + -o -perm 511 \) -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -96,15 +97,12 @@ CXXFLAGS="$SLKCFLAGS" \ --build=$ARCH-slackware-linux make -make install DESTDIR=$PKG - -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 - -find $PKG/usr/man -type f -exec gzip -9 {} \; +make install-strip DESTDIR=$PKG +gzip -9 $PKG/usr/man/man*/* # Install a sample config file and init script mkdir -p $PKG/etc/rc.d +rm -f $PKG/etc/hdapsd.conf # 20220411 bkw: derp! cat $CWD/hdapsd.conf > $PKG/etc/hdapsd.conf.new cat $CWD/rc.hdapsd > $PKG/etc/rc.d/rc.hdapsd.new chmod 0755 $PKG/etc/rc.d/rc.hdapsd.new |