summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Watson <yalhcru@gmail.com>2019-12-01 13:03:49 -0500
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2019-12-15 17:06:23 +0700
commitd72c919da156143743fb28e2d36e7b6b1cb4ef94 (patch)
tree093aaab6b03c504fedce1e3db06c3a2696c6cfda
parent049fdb710b96ee52c68bee41498158a2b5f73e41 (diff)
downloadslackbuilds-d72c919da156143743fb28e2d36e7b6b1cb4ef94.tar.gz
audio/eawpats: Update doinst.sh.
Signed-off-by: B. Watson <yalhcru@gmail.com>
-rw-r--r--audio/eawpats/doinst.sh4
-rw-r--r--audio/eawpats/eawpats.SlackBuild12
2 files changed, 10 insertions, 6 deletions
diff --git a/audio/eawpats/doinst.sh b/audio/eawpats/doinst.sh
index 110f77527d..0a9be04c39 100644
--- a/audio/eawpats/doinst.sh
+++ b/audio/eawpats/doinst.sh
@@ -13,3 +13,7 @@ config() {
config etc/timidity/eawpats.cfg.new
+# if there's no existing timidity.cfg, eawpats takes over.
+if [ ! -r etc/timidity/timidity.cfg ]; then
+ ( cd etc/timidity ; ln -sf eawpats.cfg timidity.cfg )
+fi
diff --git a/audio/eawpats/eawpats.SlackBuild b/audio/eawpats/eawpats.SlackBuild
index d109f72ed9..b2529dfde6 100644
--- a/audio/eawpats/eawpats.SlackBuild
+++ b/audio/eawpats/eawpats.SlackBuild
@@ -11,6 +11,9 @@
# This is the original author's site, but it's more polite to download
# from the gentoo mirror (see .info file)
+# 20191201 bkw: symlink eawpats.cfg to timidity.cfg in doinst.sh,
+# if there's no timidity.cfg already. This makes things Just Work(tm).
+
# 20140511 bkw: one patch was missing due to tar being silly.
# When extracting (with tar, which is really tar-1.26 on slack 14.1):
# tar: eawpats/charang.pat: implausibly old time stamp 1969-12-31 18:59:59
@@ -24,7 +27,7 @@ PRGNAM=eawpats
VERSION=${VERSION:-12}
SRCVER=${VERSION}_full
ARCH=noarch
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
CWD=$(pwd)
@@ -41,11 +44,8 @@ rm -rf $PRGNAM
tar xvf $CWD/$PRGNAM$SRCVER.tar.gz
cd $PRGNAM
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 \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
# see above
touch charang.pat