diff options
| author | B. Watson <urchlay@slackware.uk> | 2023-06-20 03:40:48 -0400 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2023-06-23 07:48:05 +0700 |
| commit | d350d81a8c8002a775f77f83120309293faca267 (patch) | |
| tree | 6bd2865ddd1a226e228a88b335716d2285174761 /network/open-isns | |
| parent | dcbef36c9809dfb91f5b8378d1e5be46cb7dd9e7 (diff) | |
network/open-isns: Use template config().
Signed-off-by: B. Watson <urchlay@slackware.uk>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'network/open-isns')
| -rw-r--r-- | network/open-isns/doinst.sh | 13 | ||||
| -rw-r--r-- | network/open-isns/open-isns.SlackBuild | 7 |
2 files changed, 9 insertions, 11 deletions
diff --git a/network/open-isns/doinst.sh b/network/open-isns/doinst.sh index 8fad217bd664..ffe6583a6782 100644 --- a/network/open-isns/doinst.sh +++ b/network/open-isns/doinst.sh @@ -1,17 +1,18 @@ +# 20230620 bkw: Please stick with the config() from our template. config() { - NEW="${1}.new" - OLD="$1" + 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 [ "$(md5sum <$OLD)" = "$(md5sum <$NEW)" ]; then + 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/isns/isnsd.conf -config etc/isns/isnsdd.conf -config etc/isns/isnsadm.conf +config etc/isns/isnsd.conf.new +config etc/isns/isnsdd.conf.new +config etc/isns/isnsadm.conf.new diff --git a/network/open-isns/open-isns.SlackBuild b/network/open-isns/open-isns.SlackBuild index d159a0676804..93207785d041 100644 --- a/network/open-isns/open-isns.SlackBuild +++ b/network/open-isns/open-isns.SlackBuild @@ -39,9 +39,6 @@ if [ -z "$ARCH" ]; then 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 @@ -76,9 +73,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" \ |