summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorB. Watson <yalhcru@gmail.com>2022-04-11 23:58:27 -0400
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2022-04-16 12:11:21 +0700
commit47805200e4d8419de83a0813497d40eb85a0761d (patch)
treeba40ff59ac2ad91747a02b5aa5b104b96a900ac6 /system
parent710df447af40331a6134e4c9bf0c81b31d8a498a (diff)
downloadslackbuilds-47805200e4d8419de83a0813497d40eb85a0761d.tar.gz
system/heartbeat: Fix doinst.sh.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'system')
-rw-r--r--system/heartbeat/doinst.sh2
-rw-r--r--system/heartbeat/heartbeat.SlackBuild10
2 files changed, 5 insertions, 7 deletions
diff --git a/system/heartbeat/doinst.sh b/system/heartbeat/doinst.sh
index bdba1fdb05..252197f2cf 100644
--- a/system/heartbeat/doinst.sh
+++ b/system/heartbeat/doinst.sh
@@ -24,4 +24,4 @@ preserve_perms() {
config etc/ha.d/authkeys.new
config etc/ha.d/ha.cf.new
config etc/ha.d/haresources.new
-preserve_perms etc/init.d/heartbeat.new
+preserve_perms etc/rc.d/init.d/heartbeat.new
diff --git a/system/heartbeat/heartbeat.SlackBuild b/system/heartbeat/heartbeat.SlackBuild
index feb624d831..df6aa1bcfc 100644
--- a/system/heartbeat/heartbeat.SlackBuild
+++ b/system/heartbeat/heartbeat.SlackBuild
@@ -22,13 +22,14 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 20220411 bkw: Modified by SlackBuilds.org, BUILD=3: fix doinst.sh.
# 20220209 bkw: Modified by SlackBuilds.org to fix the build on 15.0.
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=heartbeat
VERSION=${VERSION:-20200423}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -40,9 +41,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
@@ -77,9 +75,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 {} \+
./bootstrap