diff options
Diffstat (limited to 'desktop/wmweather+/wmweather+.SlackBuild')
| -rw-r--r-- | desktop/wmweather+/wmweather+.SlackBuild | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/desktop/wmweather+/wmweather+.SlackBuild b/desktop/wmweather+/wmweather+.SlackBuild index df90ced6a5..56a00b900c 100644 --- a/desktop/wmweather+/wmweather+.SlackBuild +++ b/desktop/wmweather+/wmweather+.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for wmweather+ # @@ -25,8 +25,9 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Now maintained by B. Watson <yalhcru@gmail.com> +# Now maintained by B. Watson <urchlay@slackware.uk> +# 20201020 bkw: update for v2.18. # 20170324 bkw: update for v2.17. # 20170121 bkw: @@ -41,10 +42,16 @@ # - install binary stripped # - i486 => i586 +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=wmweather+ -VERSION=${VERSION:-2.17} +VERSION=${VERSION:-2.18} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} + +# URL-escaped form of the name, in case something saved it as that. +ALTNAM=wmweather%2B if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -54,7 +61,11 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -79,19 +90,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" \ @@ -116,4 +125,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE |