mirror of
https://github.com/Ponce/slackbuilds
synced 2024-11-24 10:02:29 +01:00
desktop/dwm: Fix rofi theme. Add optional CK/dbus support.
This commit is contained in:
parent
c1003e4785
commit
7b4d5973fa
5 changed files with 52 additions and 16 deletions
|
@ -19,6 +19,10 @@ See README.CONFIG for more information.
|
|||
|
||||
OPTIONS
|
||||
|
||||
Use the full xinitrc with ConsoleKit and dbus support:
|
||||
|
||||
CK=yes sh dwm.SlackBuild
|
||||
|
||||
Use the system tray patch:
|
||||
|
||||
SYSTRAY=yes sh dwm.SlackBuild
|
||||
|
@ -46,7 +50,7 @@ OPTIIONAL
|
|||
st
|
||||
|
||||
A good minimal terminal with fontconfig support. Think
|
||||
"urxvt", but without perl support and the need to specify
|
||||
"urxvt", but without perl support or the need to specify
|
||||
fallback fonts manually.
|
||||
|
||||
rofi
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
|
||||
PRGNAM=dwm
|
||||
VERSION=${VERSION:-6.2}
|
||||
BUILD=${BUILD:-5}
|
||||
BUILD=${BUILD:-6}
|
||||
TAG=${TAG:-_SBo}
|
||||
|
||||
if [ -z "$ARCH" ]; then
|
||||
|
@ -137,10 +137,13 @@ make install \
|
|||
DESTDIR=$PKG
|
||||
|
||||
mkdir -p $PKG/etc/X11/xinit
|
||||
install -m 0755 $CWD/xinitrc.dwm $PKG/etc/X11/xinit/xinitrc.dwm
|
||||
|
||||
if [ "$ROFI" = "yes" ]; then
|
||||
install -m 0644 -D $CWD/dwm.rasi.new $PKG/usr/share/rofi/themes/dwm.rasi.new
|
||||
CK=${CK:-no}
|
||||
|
||||
if [ "$CK" = "yes" ]; then
|
||||
install -v -m 0755 $CWD/xinitrc.dwm.ck $PKG/etc/X11/xinit/xinitrc.dwm
|
||||
else
|
||||
install -v -m 0755 $CWD/xinitrc.dwm $PKG/etc/X11/xinit/xinitrc.dwm
|
||||
fi
|
||||
|
||||
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
|
||||
|
@ -155,7 +158,11 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
|
|||
|
||||
mkdir -p $PKG/install
|
||||
cat $CWD/slack-desc > $PKG/install/slack-desc
|
||||
cat $CWD/doinst.sh > $PKG/install/doinst.sh
|
||||
|
||||
if [ "$ROFI" = "yes" ]; then
|
||||
install -v -m 0644 -D $CWD/dwm.rasi.new $PKG/usr/share/rofi/themes/dwm.rasi.new
|
||||
cat $CWD/doinst.sh > $PKG/install/doinst.sh
|
||||
fi
|
||||
|
||||
cd $PKG
|
||||
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
|
||||
|
|
|
@ -12,10 +12,6 @@
|
|||
font: "monospace 13";
|
||||
}
|
||||
|
||||
configuration {
|
||||
display-run: "";
|
||||
}
|
||||
|
||||
#window {
|
||||
anchor: north;
|
||||
location: north;
|
||||
|
|
|
@ -24,9 +24,4 @@ if [ -f $usermodmap ]; then
|
|||
fi
|
||||
|
||||
# Start the window manager:
|
||||
if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
|
||||
exec ck-launch-session /usr/bin/dwm
|
||||
else
|
||||
exec /usr/bin/dwm
|
||||
fi
|
||||
|
||||
exec /usr/bin/dwm
|
||||
|
|
34
desktop/dwm/xinitrc.dwm.ck
Normal file
34
desktop/dwm/xinitrc.dwm.ck
Normal file
|
@ -0,0 +1,34 @@
|
|||
#!/bin/sh
|
||||
|
||||
########################################################################
|
||||
## Merge in defaults and keymaps ##
|
||||
########################################################################
|
||||
|
||||
userresources=$HOME/.Xresources
|
||||
usermodmap=$HOME/.Xmodmap
|
||||
sysresources=/etc/X11/xinit/.Xresources
|
||||
sysmodmap=/etc/X11/xinit/.Xmodmap
|
||||
|
||||
if [ -f $sysresources ]; then
|
||||
/usr/bin/xrdb -merge $sysresources
|
||||
fi
|
||||
|
||||
if [ -f $sysmodmap ]; then
|
||||
/usr/bin/xmodmap $sysmodmap
|
||||
fi
|
||||
|
||||
if [ -f $userresources ]; then
|
||||
/usr/bin/xrdb -merge $userresources
|
||||
fi
|
||||
|
||||
if [ -f $usermodmap ]; then
|
||||
/usr/bin/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/dwm
|
||||
else
|
||||
exec dbus-launch --exit-with-session /usr/bin/dwm
|
||||
fi
|
||||
|
Loading…
Reference in a new issue