xmonad-start: touch user's xmonad.hs if binary has broken shared libs for recompile
This should fix #806624 reported by Erik Streb. Needed both for upgrades to f16 (dynlink) and to f17 (gmp).
This commit is contained in:
parent
0fbbe967f5
commit
ab95445fff
19
xmonad-start
19
xmonad-start
|
@ -1,11 +1,13 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
|
XMONAD_DIR=$HOME/.xmonad
|
||||||
|
|
||||||
# if no user configuration
|
# if no user configuration
|
||||||
if [ ! -d ~/.xmonad ]; then
|
if [ ! -d $XMONAD_DIR ]; then
|
||||||
# add a desktop friendly config if possible
|
# add a desktop friendly config if possible
|
||||||
if [ -r /usr/share/xmonad/xmonad.hs ]; then
|
if [ -r /usr/share/xmonad/xmonad.hs ]; then
|
||||||
mkdir ~/.xmonad
|
mkdir $XMONAD_DIR
|
||||||
cp -p /usr/share/xmonad/xmonad.hs ~/.xmonad
|
cp -p /usr/share/xmonad/xmonad.hs $XMONAD_DIR
|
||||||
else
|
else
|
||||||
echo "xmonad-start: install xmonad-config to customize"
|
echo "xmonad-start: install xmonad-config to customize"
|
||||||
fi
|
fi
|
||||||
|
@ -15,10 +17,17 @@ if [ ! -d ~/.xmonad ]; then
|
||||||
*) TERM_CMD="xterm -e" ;;
|
*) TERM_CMD="xterm -e" ;;
|
||||||
esac
|
esac
|
||||||
(sleep 5; $TERM_CMD man xmonad) &
|
(sleep 5; $TERM_CMD man xmonad) &
|
||||||
|
else
|
||||||
|
XMONAD_CUSTOM=$XMONAD_DIR/xmonad-$(arch)-linux
|
||||||
|
if [ -r $XMONAD_DIR/xmonad.hs -a -x $XMONAD_CUSTOM ]; then
|
||||||
|
if ldd $XMONAD_DIR/xmonad-$(arch)-linux | grep -q "not found"; then
|
||||||
|
touch $XMONAD_DIR/xmonad.hs
|
||||||
|
fi
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -r ~/.xmonad/session ]; then
|
if [ -r $XMONAD_DIR/session ]; then
|
||||||
sh ~/.xmonad/session
|
sh $XMONAD_DIR/session
|
||||||
fi
|
fi
|
||||||
|
|
||||||
xmonad
|
xmonad
|
||||||
|
|
|
@ -18,7 +18,7 @@ on several screens.
|
||||||
|
|
||||||
Name: %{pkg_name}
|
Name: %{pkg_name}
|
||||||
Version: 0.10
|
Version: 0.10
|
||||||
Release: 6%{?dist}
|
Release: 7%{?dist}
|
||||||
Summary: A tiling window manager
|
Summary: A tiling window manager
|
||||||
|
|
||||||
Group: User Interface/X
|
Group: User Interface/X
|
||||||
|
@ -175,6 +175,10 @@ rm %{buildroot}%{_docdir}/%{name}-%{version}/LICENSE
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu May 24 2012 Jens Petersen <petersen@redhat.com> - 0.10-7
|
||||||
|
- xmonad-start: if user's custom xmonad has missing shared lib dependencies
|
||||||
|
touch xmonad.hs so it gets recompiled (#806624 reported by Erik Streb)
|
||||||
|
|
||||||
* Fri Mar 23 2012 Jens Petersen <petersen@redhat.com> - 0.10-6
|
* Fri Mar 23 2012 Jens Petersen <petersen@redhat.com> - 0.10-6
|
||||||
- try delaying manpage terminal startup 5s to avoid window resize
|
- try delaying manpage terminal startup 5s to avoid window resize
|
||||||
- add license to ghc_files
|
- add license to ghc_files
|
||||||
|
|
Loading…
Reference in New Issue