summaryrefslogtreecommitdiffstats
path: root/desktop/wmweather+/wmweather+.SlackBuild
diff options
context:
space:
mode:
Diffstat (limited to 'desktop/wmweather+/wmweather+.SlackBuild')
-rw-r--r--desktop/wmweather+/wmweather+.SlackBuild18
1 files changed, 10 insertions, 8 deletions
diff --git a/desktop/wmweather+/wmweather+.SlackBuild b/desktop/wmweather+/wmweather+.SlackBuild
index df90ced6a5..2b9be99f6e 100644
--- a/desktop/wmweather+/wmweather+.SlackBuild
+++ b/desktop/wmweather+/wmweather+.SlackBuild
@@ -27,6 +27,7 @@
# Now maintained by B. Watson <yalhcru@gmail.com>
+# 20201020 bkw: update for v2.18.
# 20170324 bkw: update for v2.17.
# 20170121 bkw:
@@ -42,10 +43,13 @@
# - i486 => i586
PRGNAM=wmweather+
-VERSION=${VERSION:-2.17}
+VERSION=${VERSION:-2.18}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+# URL-escaped form of the name, in case something saved it as that.
+ALTNAM=wmweather%2B
+
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i586 ;;
@@ -79,19 +83,17 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || \
+ tar xvf $CWD/$ALTNAM-$VERSION.tar.gz
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 \
- \( -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 {} \+
# Default viewer needs to be something that Slack actually has.
# Note that "xterm -e less" doesn't work: it doesn't read from the
# xterm's stdin.
-sed -i 's,xless,xmore,g' $PRGNAM.1.in $PRGNAM.c
+sed -i 's,xless,xmore,g' $PRGNAM.1 $PRGNAM.c
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \