[PATCH] ./tools/wineinstall *correct (.diff) format*

[Speeddymon]

ok, I'm re-posting these in .diff format so they will
actually be committed...

this fixes all the problems with ldconfig not being
run/being run but not with the right path, fixes not
finding real-windows registry (not accessing $LCONF)
fixes not finding registry on clean win2k install,
fixes not finding correct drive c when drive c is
ntfs-based, read the changelog/notes in each file

one known problem is that if drive c is ntfs-based and
it finds the registry, it won't install the fake one,
i didnt have any problems running my programs without
the fake registry (one is created when you install/run
your programs in wine anyways) but you never know you
might have a problem...just make sure to run regapi if
you do

another known problem is with the patch that i
submitted for wineconf, it assigns every cdrom the
device /dev/cdrom, so if you have more than 1 cdrom,
you will need to edit the wine config file (until
someone fixes that part of the perl code, seeing as
how I don't know enough perl to do a loop that adds 1
to a variable)

This patch can be applied to LGPL, X11, CodeWeavers,
and TransGaming forks without restriction.

Here it is

__________________________________________________
Do You Yahoo!?
Yahoo! Games - play chess, backgammon, pool and more
http://games.yahoo.com/
-------------- next part --------------
Index: wineinstall
Name: tools_wineinstall-dnavea-patch
ChangeLog: search for real-windows registry now actually accesses a file
ChangeLog: find clean-install win2k registry
ChangeLog: find correct partition of real Drive C (most of the time)
ChangeLog: add $libdir/wine to ld.config.so and run ldconfig
License: LGPL/X11/CodeWeavers/TransGaming
ModifiedFiles: tools/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 almost 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' ]