Module: wine Branch: master Commit: bab67d39482b473031a483b7847b8b7bac312aab URL: http://source.winehq.org/git/wine.git/?a=commit;h=bab67d39482b473031a483b784...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Apr 21 15:47:47 2008 +0200
wineprefixcreate: Use wineboot --update to run wine.inf.
---
tools/wineprefixcreate.in | 35 ++--------------------------------- 1 files changed, 2 insertions(+), 33 deletions(-)
diff --git a/tools/wineprefixcreate.in b/tools/wineprefixcreate.in index 7eed546..e06f8b6 100644 --- a/tools/wineprefixcreate.in +++ b/tools/wineprefixcreate.in @@ -59,7 +59,6 @@ esac
bindir=`cd "$bindir" && pwd` dlldir="$bindir/@bintodlldir@" -datadir="$bindir/@bintodatadir@"
do_wait=0 quiet=0 @@ -79,7 +78,6 @@ then LD_LIBRARY_PATH="$topdir/libs/wine" fi export LD_LIBRARY_PATH - datadir="$topdir/tools" fi
while [ $# -gt 0 ] @@ -122,33 +120,9 @@ else fi
WINEPREFIX=`cd "$WINEPREFIX" && pwd` - -# Create the drive symlinks - -if [ ! -d "$WINEPREFIX/dosdevices" ] -then - mkdir "$WINEPREFIX/dosdevices" - [ -d "$WINEPREFIX/drive_c" ] || mkdir "$WINEPREFIX/drive_c" - ln -s "../drive_c" "$WINEPREFIX/dosdevices/c:" - ln -s "/" "$WINEPREFIX/dosdevices/z:" -fi - -CROOT="$WINEPREFIX/dosdevices/c:" - -# Create the directory tree - -for i in \ - "$CROOT/windows" \ - "$CROOT/windows/inf" -do - [ -d "$i" ] || mkdir "$i" -done - -# Copy the .inf script and run it - -cp "$datadir/wine.inf" "$CROOT/windows/inf/wine.inf" export WINEPREFIX -"${WINELOADER:-$bindir/wine}" rundll32.exe setupapi.dll,InstallHinfSection DefaultInstall 128 wine.inf + +"${WINELOADER:-$bindir/wine}" wineboot.exe --update
# Wait for the wineserver to finish
@@ -156,8 +130,3 @@ if [ $do_wait = 1 ] then "${WINESERVER:-$bindir/wineserver}" -w fi - -if [ $quiet = 0 ] -then - echo "$WINEPREFIX updated successfully." -fi