small patch for ./tools/wineinstall

[Speeddymon]

as I have said a couple times, i dont have any way to
make the proper diff's due to the fact that I have no
internet at home, thanks again for making them for me,
I will be submitting the 2 diff's tomorrow (can't do
it here due to the fact that this computer is at
compusa and has downloading disabled)

Would there be anyone willing to make diff's for me
when I have a patch to post?  if so, could you please
email me directly so I know who to talk to?

Thanks in advance

-Dustin
--- Tony Lambregts <tony_lambregts at telusplanet.net>
wrote:
> Speeddymon wrote:
> 
> >my first patch fixes that problem and quite a few
> >others
> >
> Please resubmit your patch in proper diff  format. I
> have made proper 
> diffs for you (attached) but I don't feel right
> about submitting someone 
> elses work.  I have tested it on my machine and it
> works fine. I 
> appreciate the work you put into getting these two
> programs to work but, 
> there is no way that your "patch" will get into cvs
> unless it is in 
> proper diff format. As I said before I dont feel
> right about submitting 
> someone elses work.
> 
> 
> Tony Lambregts
> 
> > Index: wineconf
>
===================================================================
> RCS file: /home/wine/wine/tools/wineconf,v
> retrieving revision 1.12
> diff -u -r1.12 wineconf
> --- wineconf	10 Mar 2002 00:24:22 -0000	1.12
> +++ wineconf	17 Apr 2002 23:00:51 -0000
> @@ -93,13 +93,20 @@
>  
>  	my ($device, $mntpoint, $type, @rest) = split(' ',
> $_);
>  	if ($device !~ m"^/dev/fd") {
> -	    if ($type eq "msdos" || $type eq "vfat") {
> +	    if ($type eq "ntfs") {
> +		push(@::FatDrives, [$device, $mntpoint,
> 'win95']);
> +	    }
> +	    elsif ($type eq "msdos" || $type eq "vfat") {
>  		push(@::FatDrives, [$device, $mntpoint, $type]);
>  	    }
>  	    elsif ($type eq "iso9660" ||
> -		   $mntpoint eq "/cdrom" ||
> +		   ($mntpoint eq "/cdrom" && ! $type eq
> 'supermount') ||
>  		   ($device eq '/dev/cdrom' && $type eq 'auto') )
> {
>  		push(@::CdromDrives, [$device, $mntpoint,
> 'win95']);
> +	    }
> +	    elsif ( ($mntpoint eq '/mnt/cdrom' ||
> $mntpoint eq '/cdrom') 
> +		  && $type eq 'supermount') {
> +		push(@::CdromDrives, [ '/dev/cdrom', $mntpoint,
> 'win95']);
>  	    }
>  	}
>      }
> > Index: wineinstall
>
===================================================================
> RCS file: /home/wine/wine/tools/wineinstall,v
> retrieving revision 1.26
> diff -u -r1.26 wineinstall
> --- wineinstall	1 Apr 2002 20:56:51 -0000	1.26
> +++ wineinstall	17 Apr 2002 23:06:39 -0000
> @@ -74,6 +74,25 @@
>  #    that require root access
>  #  add text to tell the user we need to run stuff
> as root so they don't 
>  #    think we are trying to pull something funny
> +# Apr 14 2002 - Dustin Navea
> +#  tools/wineconf: fix to find Win2k on ntfs
> partitions (still read-only 
> +#   tho)
> +#  tools/wineconf: fix to find non-supermount
> cd-rom drives (when mounted 
> +#   at /cdrom)
> +#  tools/wineconf: fix to find supermount cd-rom
> drives and give it proper 
> +#   device name (long as there is only 1 cd-rom)
> +#  Fix sed command when finding real-windows
> registry so it actually 
> +#   accesses a file (~/.wine/config) instead of
> null ($CONF?!)
> +#  Added search for clean-install (not upgrade)
> Win2k registry
> +#  (next day, after some sleep)
> +#  Fix sed string when finding real-windows
> registry to actually find 
> +#   windows partition name in [Drive C] section
> +#  it should now always find the windows partition
> and real-windows 
> +#  registry (if not, let me know)
> +# Apr 16 2002 - Dustin Navea
> +#  for some reason everything compiles ok on my
> setup, but libntdll.dll.so
> +#   can't be found when I run wine...having
> $libdir/wine in my 
> +#   ld.config.so and running ldconfig fixed it tho,
> so I added that.
>  
>  #--- defaults (change these if you are a packager)
>  CONFARGS="--enable-opengl"    # configure args,
> e.g. --prefix=/usr --sysconfdir=/etc
> @@ -291,6 +310,14 @@
>        sucommand="echo
> $libdir>>/etc/ld.so.conf;ldconfig;$sucommand"
>      }
>      fi
> +    if [ -f /etc/ld.so.conf ] && ! grep -qs
> "$libdir/wine" /etc.ld.so.conf
> +    then {
> +      echo
> +      echo "$libdir/wine doesn't exist in your
> /etc/ld.so.conf, it will be"
> +      echo " added when we perform the install..."
> +      sucommand="echo
> $libdir/wine>>/etc/ld.so.conf;$sucommand"
> +    }
> +    fi
>  
>      echo
>  
> @@ -578,12 +605,14 @@
>  # (not to be done if windows registry exists)
>  if [ "$DOREG" = 'auto' ]
>  then {
> -  CROOT=`sed -n '/^\[Drive C\]$/,/^\[.*\]$/
> s/^Path=\(.*\)/\1/p' $CONF`
> +  CROOT=`sed -n '/^\[Drive C\]$/,/^\[.*\]$/
> s/^\"Path\" = \"\(.*\)\"/\1/p' $LCONF`
>    echo "Checking for real Windows registry..."
>    if [ -f "$CROOT/windows/system.dat" ]
>    then DOREG=no
>    elif [ -f "$CROOT/windows/system32/config/system"
> ]
>    then DOREG=no
> +  elif [ -f "$CROOT/WINNT/system32/config/system" ]
> +  then DOREG=no 
>    else DOREG=yes
>    fi
>    if [ "$DOREG" = 'yes' ]
> 


__________________________________________________
Do You Yahoo!?
Yahoo! Games - play chess, backgammon, pool and more
http://games.yahoo.com/