diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | bin/DrakWM | 17 | ||||
| -rw-r--r-- | mandrake_desk.spec | 7 |
3 files changed, 25 insertions, 4 deletions
@@ -1,3 +1,8 @@ +2000-07-18 Chmouel Boudjnah <chmouel@mandrakesoft.com> + + * bin/DrakWM: Add -i options to launch with xinit. + add -a option to provide alias for bash. + 2000-05-29 dam's <damien@mandrakesoft.com> * window-managers: changed sawmill entry into sawfish @@ -4,6 +4,7 @@ # MandrakeSoft Inc. # Redistribution of this file is permitted under the terms of the GNU # Public License (GPL) +# $Id$ ###################### # Description: Launch window manager according to # /etc/X11/window-manager with various options. @@ -14,6 +15,8 @@ my ($wm, $command, $window_mgr_file); my (@lf); my @getopt_args = ('l|list-active-session', + 'i|xinit', + 'a|alias', 'm|window-manager-file=s', 'g|with-file-manager=s', 'p|picture=s', @@ -34,6 +37,8 @@ if ($options{l}){ exit(0); } +if ($options{a}) {print "alias $_=\'$0 -i $_\';" for @lf; exit 0;} + unless ($ARGV[0]) { print STDERR "\n\t\tYou need to specify a Window Manager\n\n"; usage(1); @@ -79,8 +84,12 @@ if ($options{x}) { } # END -$command = $script{$wm} ? $script{$wm} : $script{shift @lf}; -exec ("/bin/sh", "-c", "$command"); +if (!$options{i}) { + $command = $script{$wm} ? $script{$wm} : $script{shift @lf}; + exec ("/bin/sh", "-c", "$command"); +} else { + exec ("xinit $exec{$wm}"); +} sub parse_file { my $f=shift @_; @@ -104,9 +113,11 @@ sub usage { my $e = shift @_; (my $basename = $0) =~ s|.*/||; print { $e ? STDERR : STDOUT } << "EOF"; -Usage: $0 [-Fxh] [ -b color ] [ window-manager session] +Usage: $0 [-Faixh] [ -b color ] [ window-manager session] Window-Manager launcher + -i --xinit: Launch with xinit. + -a --alias: Product alias for bourne shell. -b=COLOR --background=COLOR: Specify a background color. -g --with-file-manager: Launch with a filemanager [ KFM | GMC ] -x --with-xtermM: Display an xterm. diff --git a/mandrake_desk.spec b/mandrake_desk.spec index bfb9650..01d53df 100644 --- a/mandrake_desk.spec +++ b/mandrake_desk.spec @@ -1,6 +1,6 @@ %define name mandrake_desk %define version 1.0.4 -%define release 2mdk +%define release 3mdk Summary: The Desktop configuration files for Linux Mandrake Name: %{name} @@ -61,6 +61,11 @@ rm -rf $RPM_BUILD_ROOT /usr/man/*/* %changelog +* Tue Jul 18 2000 Chmouel Boudjnah <chmouel@mandrakesoft.com> 1.0.4-3mdk +- bin/DrakWM: + Add -i options to launch with xinit. + Add -a option to provide alias for bash. + * Mon Jul 17 2000 dam's <damien@mandrakesoft.com> 1.0.4-2mdk - replaced sawmill by sawfish |