ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed no longer needed support for patching the debugger path in the

Browse Source 
registry.
This commit is contained in:
Alexandre Julliard 2002-10-29 23:27:37 +00:00
parent 0d6eba78ed
commit 4a301f5d26
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tools/wineinstall
View File

@ -111,10 +111,6 @@ CONVCONF=no # whether we are converting an existing .winerc or not
# (DLLPATH should point to them if/when they are not in standard ld.so paths) # (DLLPATH should point to them if/when they are not in standard ld.so paths)
DLLPATH=$libdir/wine # default path of the dll .so files (except libwine.so) DLLPATH=$libdir/wine # default path of the dll .so files (except libwine.so)
# having the Wine debugger launched automatically will be a plus for us
DEBUGGER=$bindir/winedbg # the (installed) path of winedbg
HDEBUGGER=debugger/winedbg # the (non-installed) path of winedbg
# this is only for existing-windows installs # this is only for existing-windows installs
WINECONF=tools/wineconf # path to the wineconf perl script WINECONF=tools/wineconf # path to the wineconf perl script
@ -130,7 +126,6 @@ DEFCAT=cat # program to cat $DEFREG with (some packages need
# temporary files used by the installer # temporary files used by the installer
TMPCONF=/tmp/wineinstall.conf TMPCONF=/tmp/wineinstall.conf
TMPREG=/tmp/wineinstall.reg
# functions # functions
@ -414,7 +409,6 @@ then {
else LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD:$DLLPATH" else LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD:$DLLPATH"
fi fi
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
DEBUGGER="$PWD/$HDEBUGGER"
echo echo
echo "NOTE! To run Wine without installing, you must set the environment variable" echo "NOTE! To run Wine without installing, you must set the environment variable"
echo "LD_LIBRARY_PATH to $PWD:$DLLPATH" echo "LD_LIBRARY_PATH to $PWD:$DLLPATH"
@ -510,7 +504,7 @@ then {
echo -n "Searching for an existing Windows installation..." echo -n "Searching for an existing Windows installation..."
if ! $WINECONF -inifile "$WINEINI" > $TMPCONF 2>/dev/null if ! $WINECONF -inifile "$WINEINI" > $TMPCONF 2>/dev/null
then { then {
rm -f $TMPCONF $TMPREG > /dev/null rm -f $TMPCONF > /dev/null
echo " not found. (no matching /etc/fstab mount entry found)" echo " not found. (no matching /etc/fstab mount entry found)"
conf_question low do_without_windows \ conf_question low do_without_windows \
@ -691,14 +685,10 @@ then {
sed "s/\"GraphicsDriver\" = .*/\"GraphicsDriver\" = \"ttydrv\"/" $LCONF.new > $LCONF sed "s/\"GraphicsDriver\" = .*/\"GraphicsDriver\" = \"ttydrv\"/" $LCONF.new > $LCONF
fi fi
# create a temporary wineinstall.reg with fixed debugger path
$DEFCAT $DEFREG | sed "s|debugger/winedbg|${DEBUGGER}|" > $TMPREG
echo "Installing default Wine registry entries..." echo "Installing default Wine registry entries..."
echo echo
if ! $REGEDIT $TMPREG > /dev/null if ! $REGEDIT $DEFREG > /dev/null
then { then {
rm -f $TMPREG
echo "Registry install failed." echo "Registry install failed."
conf_reset_question regedit_error conf_reset_question regedit_error
conf_question high regedit_error conf_question high regedit_error
@ -710,9 +700,8 @@ then {
# registry data. so if we are converting we need to run regedit twice # registry data. so if we are converting we need to run regedit twice
if [ "$CONVCONF" = 'yes' ] if [ "$CONVCONF" = 'yes' ]
then then
if ! $REGEDIT $TMPREG > /dev/null if ! $REGEDIT $DEFREG > /dev/null
then then
rm -f $TMPREG
echo "Registry install failed." echo "Registry install failed."
conf_reset_question regedit_error conf_reset_question regedit_error
conf_question high regedit_error conf_question high regedit_error
@ -727,7 +716,6 @@ then {
fi fi
} }
fi fi
rm -f $TMPREG
if [ "$SYSREG" = 'auto' ] if [ "$SYSREG" = 'auto' ]
then SYSREG=yes then SYSREG=yes
fi fi
@ -769,9 +757,6 @@ fi
if [ -f $TMPCONF ] if [ -f $TMPCONF ]
then rm -f $TMPCONF then rm -f $TMPCONF
fi fi
if [ -f $TMPREG ]
then rm -f $TMPREG
fi
# it's a wrap # it's a wrap