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

Fixed a few problems.

Browse Source
This commit is contained in:
Ove Kaaven 2000-07-23 13:32:04 +00:00 committed by Alexandre Julliard
parent 17b341270a
commit 91ae8cb23c
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/wineinstall
View File

@ -149,7 +149,7 @@ 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 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"
@ -302,13 +302,15 @@ then {
[ -f "$CROOT/windows/system.ini" ] || cp "$SYSTEMINI" "$CROOT/windows/system.ini" [ -f "$CROOT/windows/system.ini" ] || cp "$SYSTEMINI" "$CROOT/windows/system.ini"
if [ "$DOCONF" = 'yes' ] if [ "$DOCONF" = 'yes' ]
then { then {
sed "s/Path=\/c$/Path=${CROOT//\//\\/}/" $WINEINI > $CONF sed "s|Path=/c\$|Path=${CROOT}|" $WINEINI > $CONF
echo "Created $CONF using default Wine configuration." echo "Created $CONF using default Wine configuration."
echo "You probably want to review the file, though." echo "You probably want to review the file, though."
} }
fi fi
# now we really need to install the registry # now we really should install the registry
DOREG=yes if [ "$DOREG" = 'auto' ]
then DOREG=yes
fi
} }
elif [ -z "$CROOT" ] elif [ -z "$CROOT" ]
then { then {
@ -323,7 +325,7 @@ echo
if [ "$DOCONF" = 'yes' ] if [ "$DOCONF" = 'yes' ]
then { then {
echo "Setting EXTRA_LD_LIBRARY_PATH in .winerc to $DLLPATH..." echo "Setting EXTRA_LD_LIBRARY_PATH in .winerc to $DLLPATH..."
sed "s/EXTRA_LD_LIBRARY_PATH=.*/EXTRA_LD_LIBRARY_PATH=${DLLPATH//\//\\/}/" $CONF > $CONF.new sed "s|EXTRA_LD_LIBRARY_PATH=.*|EXTRA_LD_LIBRARY_PATH=${DLLPATH}|" $CONF > $CONF.new
mv -f $CONF.new $CONF mv -f $CONF.new $CONF
echo echo
} }
@ -366,7 +368,7 @@ then {
sed "s/GraphicsDriver=.*/GraphicsDriver=ttydrv/" $CONF > $TMPCONF sed "s/GraphicsDriver=.*/GraphicsDriver=ttydrv/" $CONF > $TMPCONF
# create a temporary wineinstall.reg with fixed debugger path # create a temporary wineinstall.reg with fixed debugger path
sed "s/debugger\/winedbg/${DEBUGGER//\//\\/}/" $DEFREG > $TMPREG sed "s|debugger/winedbg|${DEBUGGER}|" $DEFREG > $TMPREG
echo "Installing default Wine registry entries..." echo "Installing default Wine registry entries..."
echo echo
@ -389,6 +391,7 @@ fi
# make root's registry global, if desired # make root's registry global, if desired
if [ `whoami` = 'root' ] && [ "$SYSREG" = 'yes' ] if [ `whoami` = 'root' ] && [ "$SYSREG" = 'yes' ]
then { then {
[ -d ~/.wine ] || mkdir ~/.wine
if ! [ -f $sysconfdir/wine.userreg ] if ! [ -f $sysconfdir/wine.userreg ]
then { then {
echo "Linking root's user registry hive to the global registry..." echo "Linking root's user registry hive to the global registry..."