xinitrc still broken in rc2

[Olivier Fourdan]

Martti,

Can you try the one attached? It's based on yous, with slight
modifications...

TIA
Olivier.

On Mon, 2003-07-21 at 10:32, Martti Kuparinen wrote:
> Hi!
> 
> The xfce4-utils's xinitrc script is still broken in rc2. This is what I
> get from "which xfce4-session":
> 
> no xfce4-session in /bin /usr/bin /sbin /usr/sbin /usr/X11R6/bin 
> /usr/local/sbin /usr/local/bin /usr/pkg/bin /usr/pkg/sbin .
> 
> So obviously this does NOT match "no". I fixed this with the attached patch.
> The patch includes also a fix to my $UID problem.
> 
> Martti
> 
> ______________________________________________________________________
> $NetBSD$
> 
> --- scripts/xinitrc.orig	Fri Jul 18 16:07:47 2003
> +++ scripts/xinitrc	Mon Jul 21 11:21:33 2003
> @@ -14,15 +14,19 @@
>  EOF
>  
>  # Launch xscreensaver (if available), but only as non-root user
> -test $UID -gt 0 && xscreensaver -no-splash &
> +test `id -u` -gt 0 && xscreensaver -no-splash &
>  
>  # Run xfce4-session if installed
>  xfcesm=`which xfce4-session`
> -if test "x$xfcesm" != "x" && test "x$xfcesm" != "xno" ; then
> -	exec $xfcesm
> -        # Shouldn't get there, but anyway...
> -        exit
> -fi
> +case "x$xfcesm" in
> +	x|xno*)
> +		;;
> +	*)
> +		exec $xfcesm
> +		# Shouldn't get there, but anyway...
> +		exit
> +		;;
> +esac
>  
>  # or use old-fashioned startup script otherwise
>  xfce-mcs-manager
> 
> ______________________________________________________________________
> _______________________________________________
> Xfce4-dev mailing list
> Xfce4-dev at xfce.org
> http://moongroup.com/mailman/listinfo/xfce4-dev
-- 
Olivier Fourdan - fourdan at xfce.org
   
   Interoperability is the keyword, uniformity is a dead end. 
   http://www.xfce.org


-------------- next part --------------
A non-text attachment was scrubbed...
Name: xinitrc
Type: text/x-sh
Size: 1633 bytes
Desc: not available
URL: <http://mail.xfce.org/pipermail/xfce4-dev/attachments/20030721/d5ca61e0/attachment.sh>