diff options
Diffstat (limited to 'desktop/j4-dmenu-desktop/j4-dmenu-desktop.SlackBuild')
| -rw-r--r-- | desktop/j4-dmenu-desktop/j4-dmenu-desktop.SlackBuild | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/desktop/j4-dmenu-desktop/j4-dmenu-desktop.SlackBuild b/desktop/j4-dmenu-desktop/j4-dmenu-desktop.SlackBuild index 93dbf04ebb..59c3c05242 100644 --- a/desktop/j4-dmenu-desktop/j4-dmenu-desktop.SlackBuild +++ b/desktop/j4-dmenu-desktop/j4-dmenu-desktop.SlackBuild @@ -6,8 +6,11 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. -# Zip file created with: -# wget -O j4-dmenu-desktop-$(date +%Y%m%d).zip https://github.com/enkore/j4-dmenu-desktop/archive/master.zip +# 20150512 bkw: +# - Update for 2.12 release. +# - Replace my man page with upstream's (from git). +# - Escape dashes in terminal name, in man page (MANTERM). +# - Replace no_interactive_shell.diff with sed -i. # 20140724 bkw: updated to 20140724 snapshot. # - Default to TERMINAL=xterm if i3-sensible-terminal not installed @@ -21,7 +24,7 @@ # - Added default terminal selection PRGNAM=j4-dmenu-desktop -VERSION=${VERSION:-20140724} +VERSION=${VERSION:-2.12} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -57,9 +60,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-master -unzip $CWD/$PRGNAM-$VERSION.zip -cd $PRGNAM-master +rm -rf $PRGNAM-r$VERSION +tar xvf $CWD/$PRGNAM-r$VERSION.tar.gz || tar xvf $CWD/r$VERSION.tar.gz +cd $PRGNAM-r$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -71,7 +74,7 @@ find -L . \ # the user's choice. bash -i means interactive shell... which causes it to # hang if there's no controlling terminal. No idea why upstream wanted the -i # option in the first place, I've asked but not gotten an answer. -patch -p1 < $CWD/no_interactive_shell.diff +sed -i '/execl(shell/s|"-i", *||' src/*.hh # For users who don't use i3, let them pick the default terminal. # If TERMINAL not set, and i3-sensible-terminal not installed, just @@ -83,6 +86,7 @@ else fi TERMINAL="${TERMINAL:-$DEFTERM}" +MANTERM="$( echo $TERMINAL | sed 's,-,\\\\-,g' )" echo "Using TERMINAL=$TERMINAL" sed -i "s,i3-sensible-terminal,$TERMINAL,g" src/Main.hh @@ -103,13 +107,13 @@ cd build install -m0755 -s $PRGNAM $PKG/usr/bin/$PRGNAM cd .. -# man page written for this SlackBuild. +# man page taken from upstream git. mkdir -p $PKG/usr/man/man1 -sed "s,_TERMINAL_,$TERMINAL,g" < $CWD/$PRGNAM.1 | \ +sed "s,_TERMINAL_,$MANTERM,g" < $CWD/$PRGNAM.1 | \ gzip -9c > $PKG/usr/man/man1/$PRGNAM.1.gz mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CHANGELOG LICENSE README.md $CWD/$PRGNAM.pod $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CHANGELOG LICENSE README* $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install |