hi all here are a couple of patches for the wineinstall and wineconf scripts. the wineinstall patch fixes the find windows registry function and the wineconf patch includes the root directory as a dos drive so the regapi and wine debugger can be found. wineinstall Changelog Shane Shields locutus@all.at changed the find windows registry function small code cleanup wineconf Changelog Shane Shields locutus@all.at added / as a dos drive Shane
--- ./tools/wineinstall.orig Sun Jan 6 13:14:07 2002 +++ ./tools/wineinstall Sat Jan 19 11:50:04 2002 @@ -389,7 +389,6 @@ } else { echo " found." - conf_reset_question windows_found conf_question low windows_found \ "Created $LCONF using your existing Windows installation." \ @@ -511,16 +510,21 @@ if [ "$DOREG" = 'auto' ] then { echo "Checking for real Windows registry..." + while read TPATH junk TROOT + do + if [ "$TPATH" = '"Path"' ] + then + OLDPWD=$TROOT + CROOT=~- + break + fi + done < $LCONF if [ -f "$CROOT/windows/system.dat" ] then DOREG=no elif [ -f "$CROOT/windows/system32/config/system" ] then DOREG=no else DOREG=yes fi - if [ "$DOREG" = 'yes' ] - then echo "Not found, default Wine registry will be installed." - else echo "Windows registry found, will not install default Wine registry." - fi echo } fi @@ -528,10 +532,11 @@ # install default registry entries if [ "$DOREG" = 'yes' ] then { + echo "Not found, default Wine registry will be installed." if [ "$BINDIST" = 'no' ] then { echo "Compiling regapi..." - (cd programs/regapi; make) + (cd programs/regapi; make) > /dev/null echo } fi @@ -598,6 +603,7 @@ sed "s/\"GraphicsDriver\" = .*/\"GraphicsDriver\" = \"x11drv\"/" $LCONF > $LCONF.new mv $LCONF.new $LCONF } +else echo "Windows registry found, will not install default Wine registry." fi # make root's registry global, if desired
--- ./tools/wineconf.orig Sat Jan 19 11:41:50 2002 +++ ./tools/wineconf Fri Jan 18 23:42:43 2002 @@ -96,6 +96,7 @@ warn "cannot help you (yet)\n"; exit(1); } + push(@::UnixDrives, ['', '/', 'hd']); push(@::UnixDrives, ['', '/tmp', 'hd']); push(@::UnixDrives, ['', '${HOME}', 'network']); my $MagicDrive = 'C';