diff options
| -rw-r--r-- | desktop/echinus/echinus.SlackBuild | 15 | ||||
| -rw-r--r-- | desktop/echinus/xinitrc.echinus | 30 |
2 files changed, 37 insertions, 8 deletions
diff --git a/desktop/echinus/echinus.SlackBuild b/desktop/echinus/echinus.SlackBuild index d112eb7e64..3b2375495a 100644 --- a/desktop/echinus/echinus.SlackBuild +++ b/desktop/echinus/echinus.SlackBuild @@ -1,9 +1,8 @@ #!/bin/bash +# Slackware build script for echinus -# Slackware build script for <appname> - -# Written by Charles E. Kauffman gahlgwogi@lycos.com +# Written by Charles E. Kauffman <email removed>. # Modified from Tom Canich's slackbuild for dwm. # Modified by B. Watson @@ -11,18 +10,21 @@ # had no license; modified version is licensed under the WTFPL. # See http://www.wtfpl.net/txt/copying/ for details. +# 20210907 bkw: BUILD=3, *actually* add the xinitrc. Nobody noticed +# this build was broken for 1.5 years, so would anyone miss it if +# it went away? + # 20200101 bkw: # - take over maintenance # - BUILD=2 # - add xinitrc # - simplify build - cd $(dirname $0) ; CWD=$(pwd) PRGNAM=echinus VERSION=${VERSION:-0.4.9} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -34,9 +36,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 diff --git a/desktop/echinus/xinitrc.echinus b/desktop/echinus/xinitrc.echinus new file mode 100644 index 0000000000..7827671dbb --- /dev/null +++ b/desktop/echinus/xinitrc.echinus @@ -0,0 +1,30 @@ +#!/bin/sh + +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +sysresources=/etc/X11/xinit/.Xresources +sysmodmap=/etc/X11/xinit/.Xmodmap + +# merge in defaults and keymaps +if [ -f $sysresources ]; then + xrdb -merge $sysresources +fi + +if [ -f $sysmodmap ]; then + xmodmap $sysmodmap +fi + +if [ -f $userresources ]; then + xrdb -merge $userresources +fi + +if [ -f $usermodmap ]; then + xmodmap $usermodmap +fi + +# Start the window manager: +if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then + exec ck-launch-session dbus-launch --exit-with-session /usr/bin/echinus +else + exec dbus-launch --exit-with-session /usr/bin/echinus +fi |