Commit 9ce6ff26 authored by Vincent Béron's avatar Vincent Béron Committed by Alexandre Julliard

Remove "Path" lines from sample config.

Setup the links for the default DOS drives in wineinstall.
parent 23a1c12d
...@@ -14,30 +14,24 @@ WINE REGISTRY Version 2 ...@@ -14,30 +14,24 @@ WINE REGISTRY Version 2
;; "Device"="/dev/xx" (only if you want to allow raw device access) ;; "Device"="/dev/xx" (only if you want to allow raw device access)
;; ;;
[Drive A] [Drive A]
"Path" = "/mnt/fd0"
"Type" = "floppy" "Type" = "floppy"
"Device" = "/dev/fd0" "Device" = "/dev/fd0"
[Drive C] [Drive C]
"Path" = "/c"
"Type" = "hd" "Type" = "hd"
[Drive D] [Drive D]
"Path" = "/cdrom"
"Type" = "cdrom" "Type" = "cdrom"
; make sure that device is correct and has proper permissions ! ; make sure that device is correct and has proper permissions !
"Device" = "/dev/cdrom" "Device" = "/dev/cdrom"
[Drive E] [Drive E]
"Path" = "/tmp"
"Type" = "hd" "Type" = "hd"
[Drive F] [Drive F]
"Path" = "%HOME%"
"Type" = "network" "Type" = "network"
[Drive Z] [Drive Z]
"Path" = "/"
"Type" = "hd" "Type" = "hd"
[wine] [wine]
......
...@@ -525,7 +525,7 @@ then { ...@@ -525,7 +525,7 @@ then {
# create $LCONF using the default config file $WINEINI # create $LCONF using the default config file $WINEINI
if [ "$DOLOCALCONF" = 'yes' ] if [ "$DOLOCALCONF" = 'yes' ]
then { then {
sed "s|\"Path\" = \"/c\"\$|\"Path\" = \"${CROOT}\"|" $WINEINI > $TMPCONF cp $WINEINI $TMPCONF
conf_reset_question default_config conf_reset_question default_config
conf_question low default_config \ conf_question low default_config \
"Created $LCONF using default Wine configuration." \ "Created $LCONF using default Wine configuration." \
...@@ -547,6 +547,7 @@ then ...@@ -547,6 +547,7 @@ then
if [ ! -w ~/.wine ] if [ ! -w ~/.wine ]
then then
mkdir ~/.wine mkdir ~/.wine
mkdir ~/.wine/dosdevices
fi fi
cp $TMPCONF $LCONF > /dev/null cp $TMPCONF $LCONF > /dev/null
else else
...@@ -599,15 +600,18 @@ then { ...@@ -599,15 +600,18 @@ then {
echo "Preparing to install default Wine registry entries..." echo "Preparing to install default Wine registry entries..."
# Make sure we are on a Windows drive # Make sure we are on a Windows drive
mv $LCONF $LCONF.orig ln -s /mnt/fd0 ~/.wine/dosdevices/a:
sed "s/\"Path\" = \"%HOME%\"$/\"Path\" = \"%PWD%\"/" $LCONF.orig> $LCONF ln -s $CROOT ~/.wine/dosdevices/c:
ln -s /cdrom ~/.wine/dosdevices/d:
ln -s /tmp ~/.wine/dosdevices/e:
ln -s ~ ~/.wine/dosdevices/f:
ln -s / ~/.wine/dosdevices/z:
echo "Installing default Wine registry entries..." echo "Installing default Wine registry entries..."
echo echo
if ! $RUNDLL32 setupapi.dll,InstallHinfSection DefaultInstall 128 $INFSCRIPT > /dev/null if ! $RUNDLL32 setupapi.dll,InstallHinfSection DefaultInstall 128 $INFSCRIPT > /dev/null
then { then {
echo "Registry install failed." echo "Registry install failed."
mv $LCONF.orig $LCONF
conf_reset_question regedit_error conf_reset_question regedit_error
conf_question high regedit_error conf_question high regedit_error
exit 1 exit 1
...@@ -615,7 +619,6 @@ then { ...@@ -615,7 +619,6 @@ then {
else { else {
echo echo
echo "Registry entries successfully installed." echo "Registry entries successfully installed."
mv $LCONF.orig $LCONF
} }
fi fi
if [ "$SYSREG" = 'auto' ] if [ "$SYSREG" = 'auto' ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment