[PATCH UPDATE] tools/wineinstall

[Speeddymon]

Alexandre asked me to remove the $libdir/wine I added
to the last patch, so I did, I also received an email
saying that the reason I was receiving the error that
I was getting was possibly because a file had been
updates/renamed and ldconfig had NOT been run, so I
changed it so that ldconfig is now always run
regardless of what has or has not been added to
ld.so.conf, this also fixes the problems with users
having bash say that it could not find - by putting a
space between -c and "$sucommand" when su is run to
switch to root...

any comments, feel free

__________________________________________________
Do You Yahoo!?
Yahoo! Games - play chess, backgammon, pool and more
http://games.yahoo.com/
-------------- next part --------------
Name: tools_wineinstall-dnavea-patch.diff
ModifiedFiles: tools/wineinstall
ChangeLog: fix finding real-windows drive c when it is ntfs, fix finding 
	     real-windows registry on clean win2k/winnt installs, fix 
	     finding real-windows registry altogether (in most cases), 
	     always run ldconfig when running make install
=============================================================================== 
--- tools/wineinstall	
Mon Apr  1 14:56:51 2002 +++ /tmp/wineinstall	Wed Apr 24 12:38:59 2002
@@ -72,8 +72,34 @@
 #  prevent the user from running wineinstall as root
 #  add script commands so we su root for 'make install' and other commands
 #    that require root access
-#  add text to tell the user we need to run stuff as root so they don't 
+#  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.
+# Apr 23 2002 - Dustin Navea
+#  Removed $libdir/wine from ld.so.conf.  The script only needs to run 
+#    ldconfig with $libdir and maybe $dllpath
+#  Fixed su to root command to work on every system (-c"" is now -c "")
+# Apr 24 2002 - Dustin Navea
+#  ldconfig now runs every time make install is run (for in the event that 
+#    a file is updated but $libdir was already in ld.so.conf)
 
 #--- defaults (change these if you are a packager)
 CONFARGS="--enable-opengl"    # configure args, e.g. --prefix=/usr --sysconfdir=/etc
@@ -283,13 +309,20 @@
 
     # if the user doesn't have $libdir in their ld.so.conf add this
     # to our sucommand string
-    if [ -f /etc/ld.so.conf ] && ! grep -qs "$libdir" /etc/ld.so.conf
-    then {
-      echo
-      echo "$libdir doesn't exist in your /etc/ld.so.conf, it will be added"
-      echo "when we perform the install..."
-      sucommand="echo $libdir>>/etc/ld.so.conf;ldconfig;$sucommand"
-    }
+    if [ -f /etc/ld.so.conf ]
+    then
+      if [ ! grep -qs "$libdir" /etc/ld.so.conf ]
+      then {
+	echo
+	echo "$libdir doesn't exist in your /etc/ld.so.conf, it will be added"
+	echo "when we perform the install..."
+	sucommand="echo $libdir>>/etc/ld.so.conf;ldconfig;$sucommand"
+      }
+      # run ldconfig anyways just in case some updated files dont get linked
+      else {
+	sucommand="ldconfig;$sucommand"
+      }
+      fi
     fi
 
     echo
@@ -317,7 +350,7 @@
 
     std_sleep
 
-    if ! su root -c"$sucommand"
+    if ! su root -c "$sucommand"
     then {
       echo
       echo "Either you entered an incorrect password or we failed to run"
@@ -578,12 +611,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' ]
@@ -697,7 +732,6 @@
 if [ -f $TMPREG ]
 then rm -f $TMPREG
 fi
-
 
 # it's a wrap
 echo