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

Switched from wine.config back to wine.conf, no need to use something 

not linux standard.  Removed use of obsolete "--config" option when
calling regapi.  Lots of cleanup and reorganization.  Check to see if
wine is installed when wineinstall is not run as root.
This commit is contained in:
Chris Morgan 2001-01-18 20:29:21 +00:00 committed by Alexandre Julliard
parent e1c09e2c72
commit a00cefb7e4
1 changed files with 191 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

314
tools/wineinstall
View File

@ -37,9 +37,14 @@
# replace .winerc with ~/.wine/config in printed text # replace .winerc with ~/.wine/config in printed text
# added user question to convert .winerc file(if exists) or use the default # added user question to convert .winerc file(if exists) or use the default
# config file # config file
# updated global config name, wine.conf -> wine.config
# add conf_question to allow root to install a local config file and # add conf_question to allow root to install a local config file and
# registry # registry
# Jan 12 2000 - Chris Morgan
# distinguish between creating local and global config files
# display a message about the status of global config files
# misc cleanups and reordering of questions
# added check to see if wine is installed when we are running as a normal
# user and print a message if wine cannot be found
#--- defaults (change these if you are a packager) #--- defaults (change these if you are a packager)
CONFARGS=--enable-opengl # configure args, e.g. --prefix=/usr --sysconfdir=/etc CONFARGS=--enable-opengl # configure args, e.g. --prefix=/usr --sysconfdir=/etc
@ -48,9 +53,11 @@ sysconfdir=$prefix/etc # where wine.conf and global registry is supposed
bindir=$prefix/bin # where winelib apps will be (or is) installed bindir=$prefix/bin # where winelib apps will be (or is) installed
libdir=$prefix/lib # where libwine.so will be (or is) installed libdir=$prefix/lib # where libwine.so will be (or is) installed
exdir=documentation/samples # where the example system.ini resides exdir=documentation/samples # where the example system.ini resides
CONF=$sysconfdir/wine.config # default path of the wine.config GCONF=$sysconfdir/wine.conf # default path of the wine.conf global config file
LCONF=~/.wine/config # default path of the local config file
BINDIST=no # whether called from a binary package config script BINDIST=no # whether called from a binary package config script
DOCONF=auto # whether to autogenerate wine.config DOGLOBALCONF=auto # whether to autogenerate wine.conf
DOLOCALCONF=auto # whether to autogenerate localconf
DOWCHK=auto # whether to autoconfigure existing-windows installation DOWCHK=auto # whether to autoconfigure existing-windows installation
DOWINE=auto # whether to autoconfigure no-windows installation DOWINE=auto # whether to autoconfigure no-windows installation
DOREG=auto # whether to install default registry DOREG=auto # whether to install default registry
@ -124,9 +131,20 @@ function conf_string_answer {
read ANSWER read ANSWER
} }
function create_windows_directories {
for tdir in "$CROOT/windows" "$CROOT/windows/system" \
"$CROOT/windows/Start Menu" "$CROOT/windows/Start Menu/Programs" \
"$CROOT/Common Files" "$CROOT/Program Files" \
"$CROOT/windows/Profiles" "$CROOT/windows/Profiles/Administrator"
do [ -d "$tdir" ] || mkdir "$tdir"
done
[ -f "$CROOT/windows/win.ini" ] || cp "$WININI" "$CROOT/windows/win.ini"
[ -f "$CROOT/windows/system.ini" ] || cp "$SYSTEMINI" "$CROOT/windows/system.ini"
}
# startup... # startup...
echo "WINE Installer v0.6" echo "WINE Installer v0.7"
echo echo
if [ "$BINDIST" = 'no' ] if [ "$BINDIST" = 'no' ]
@ -233,6 +251,7 @@ fi
if [ `whoami` != 'root' ] if [ `whoami` != 'root' ]
then { then {
echo "You aren't root, so I'll skip the make install." echo "You aren't root, so I'll skip the make install."
# setup to run from current directory # setup to run from current directory
DLLPATH="$PWD/dlls" DLLPATH="$PWD/dlls"
if [ -z "$LD_LIBRARY_PATH" ] if [ -z "$LD_LIBRARY_PATH" ]
@ -245,6 +264,18 @@ then {
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"
echo "in your logon scripts." echo "in your logon scripts."
echo
# see if wine is installed on the users system, if not prompt them
# and then exit
if [ ! `which wine` ]
then
echo "Could not find wine on your system. Run wineinstall as root to install wine"
echo "before re-running wineinstall as a user."
echo
echo "Exiting wineinstall"
exit 1;
fi
} }
else { else {
echo "Now installing binaries onto the system..." echo "Now installing binaries onto the system..."
@ -272,66 +303,73 @@ fi
} }
fi # BINDIST fi # BINDIST
# now check whether we should generate wine.config # now check whether we should generate wine.conf
if [ -z "$DOCONF" ] if [ -z "$DOGLOBALCONF" ]
then DOCONF=auto then DOGLOBALCONF=auto
fi fi
if [ "$DOCONF" = 'auto' ] if [ "$DOGLOBALCONF" = 'auto' ]
then { then {
# see if we already have a system wine.config # see if we already have a system wine.conf
if [ -f $CONF ] if [ ! -f $GCONF ] && [ `whoami` = 'root' ]
then DOCONF=no then
DOGLOBALCONF=no
echo "Creation of a global config file is not supported in wineinstall at this"
echo "time. When the configuration architecture is cleaned up this functionality"
echo "will be restored to wineinstall."
echo
fi fi
} }
fi fi
if [ "$DOCONF" != 'no' ] if [ "$DOLOCALCONF" = 'auto' ]
then { then {
if [ `whoami` != 'root' ] # see if the user is root, if so, explicitly ask them if they want a
then { # local config file
CONF=~/.wine/config if [ `whoami` = 'root' ]
if ! [ -f $CONF ] then
then { echo "You are running as root. Do you want a local config file,"
if [ "$DOCONF" != 'yes' ] echo "file, ~/.wine/config, created?"
then { conf_yesno_answer "(yes/no) "
conf_question medium make_user_config \ DOLOCALCONF="$ANSWER"
"Since you aren't root, and there's no system wine.config, I assume" \ else
"you want a user-specific ~/.wine/config. Am I correct?" echo "Create local config file ~/.wine/config?"
conf_yesno_answer "(yes/no) " conf_yesno_answer "(yes/no) "
DOCONF="$ANSWER" echo
} DOLOCALCONF="$ANSWER"
fi if [ "$ANSWER" = 'no' ]
if [ "$DOCONF" = 'no' ] then
then { conf_question high need_root \
conf_question high need_root \ "Aborting install. Try again as root to generate a system wine.conf."
"Aborting install. Try again as root to generate a system wine.config." exit 1
exit 1 fi
} fi
fi
echo if [ -f "$LCONF" ]
} then
echo "Found existing $LCONF, if you continue this file will be"
echo "overwritten. Continue running wineinstall?"
conf_yesno_answer "(yes/no) "
echo
if [ "$ANSWER" = 'no' ]
then
echo "Exiting wineinstall"
exit 1
fi fi
}
else {
mkdir -p $sysconfdir
DOCONF=yes
}
fi fi
} }
fi fi
# generate wine.config from existing windows install, if any # generate $TMPCONF from existing windows install, if any
if [ "$DOCONF" = 'yes' ] if [ "$DOLOCALCONF" = 'yes' ]
then { then {
if [ "$DOWCHK" = 'yes' ] || [ "$DOWCHK" = 'auto' ] if [ "$DOWCHK" = 'yes' ] || [ "$DOWCHK" = 'auto' ]
then { then {
echo
echo -n "Searching for an existing Windows installation..." echo -n "Searching for an existing Windows installation..."
mkdir -p ~/.wine if ! $WINECONF -inifile "$WINEINI" > $TMPCONF 2>/dev/null
if ! $WINECONF -inifile "$WINEINI" > $CONF 2>/dev/null
then { then {
rm -f $CONF rm -f $TMPCONF $TMPREG > /dev/null
echo " not found." echo " not found."
conf_question low do_without_windows \ conf_question low do_without_windows \
"Windows was not found on your system, so I assume you want" \ "Windows was not found on your system, so I assume you want" \
@ -341,7 +379,7 @@ then {
then { then {
conf_question high windows_not_found \ conf_question high windows_not_found \
"Aborting install. Make sure your Windows partition is mounted and try again," \ "Aborting install. Make sure your Windows partition is mounted and try again," \
"or create $CONF manually by copying from $WINEINI and adapting the drive paths." "or create $LCONF manually by copying from $WINEINI and adapting the drive paths."
exit 1 exit 1
} }
fi fi
@ -349,9 +387,10 @@ then {
} }
else { else {
echo " found." echo " found."
conf_reset_question windows_found conf_reset_question windows_found
conf_question low windows_found \ conf_question low windows_found \
"Created $CONF using your existing Windows installation." \ "Created $LCONF using your existing Windows installation." \
"You probably want to review the file, though." "You probably want to review the file, though."
DOWINE=no DOWINE=no
} }
@ -362,52 +401,23 @@ then {
fi fi
} }
elif [ "$DOWINE" = 'auto' ] elif [ "$DOWINE" = 'auto' ]
then DOWINE=no then
DOWINE=no
fi fi
# setup a no-windows installation, if necessary # setup a no-windows installation, if necessary
if [ "$DOWINE" = 'yes' ] if [ "$DOWINE" = 'yes' ]
then { then {
# set an appropriate DCROOT
if [ `whoami` != 'root' ] if [ `whoami` != 'root' ]
then DCROOT=~/c then DCROOT=~/c
else DCROOT=/c else DCROOT=/c
fi fi
conf_question low drivec_path \
"Configuring Wine without Windows." \
"Some fake Windows directories must be created, to hold any .ini files, DLLs," \
"start menu entries, and other things your applications may need to install." \
"Where would you like your fake C drive to be placed?"
while [ -z "$CROOT" ]
do {
conf_string_answer "(default is $DCROOT) "
[ -z "$ANSWER" ] && ANSWER="$DCROOT"
if ! [ -d "$ANSWER" ]
then {
if mkdir -p "$ANSWER"
then CROOT="$ANSWER"
else
echo "Directory $ANSWER can't be created !"
conf_reset_question drivec_path
fi
}
else CROOT="$ANSWER"
fi
}
done
echo "Configuring Wine for a no-windows install in $CROOT..."
for tdir in "$CROOT/windows" "$CROOT/windows/system" \
"$CROOT/windows/Start Menu" "$CROOT/windows/Start Menu/Programs" \
"$CROOT/Common Files" "$CROOT/Program Files" \
"$CROOT/windows/Profiles" "$CROOT/windows/Profiles/Administrator"
do [ -d "$tdir" ] || mkdir "$tdir"
done
[ -f "$CROOT/windows/win.ini" ] || cp "$WININI" "$CROOT/windows/win.ini"
[ -f "$CROOT/windows/system.ini" ] || cp "$SYSTEMINI" "$CROOT/windows/system.ini"
if [ -f ~/.winerc ] if [ -f ~/.winerc ]
then { then {
conf_question medium convert_config \ conf_question medium convert_config \
"I found a the old version Wine config file, .winerc, in your " \ "I found the old version Wine config file, .winerc, in your " \
"home directory. I can convert this to the new format or use the" \ "home directory. I can convert this to the new format or use the" \
"new default Wine config file. Convert?" "new default Wine config file. Convert?"
conf_yesno_answer "(yes/no) " conf_yesno_answer "(yes/no) "
@ -418,15 +428,43 @@ then {
} }
fi fi
} }
else {
conf_question low drivec_path \
"Configuring Wine without Windows." \
"Some fake Windows directories must be created, to hold any .ini files, DLLs," \
"start menu entries, and other things your applications may need to install." \
"Where would you like your fake C drive to be placed?"
while [ -z "$CROOT" ]
do {
conf_string_answer "(default is $DCROOT) "
[ -z "$ANSWER" ] && ANSWER="$DCROOT"
if ! [ -d "$ANSWER" ]
then {
if mkdir -p "$ANSWER"
then CROOT="$ANSWER"
else
echo "Directory $ANSWER can't be created !"
conf_reset_question drivec_path
fi
}
else CROOT="$ANSWER"
fi
}
done
echo "Configuring Wine for a no-windows install in $CROOT..."
create_windows_directories
}
fi fi
# create $CONF using the default config file $WINEINI # create $LCONF using the default config file $WINEINI
if [ "$DOCONF" = 'yes' ] && [ "$CONVCONF" = 'no' ] if [ "$DOLOCALCONF" = 'yes' ] && [ "$CONVCONF" = 'no' ]
then { then {
sed "s|\"Path\" = \"/c\"\$|\"Path\" = \"${CROOT}\"|" $WINEINI > $CONF sed "s|\"Path\" = \"/c\"\$|\"Path\" = \"${CROOT}\"|" $WINEINI > $TMPCONF
conf_reset_question default_config conf_reset_question default_config
conf_question low default_config \ conf_question low default_config \
"Created $CONF using default Wine configuration." \ "Created $LCONF using default Wine configuration." \
"You probably want to review the file, though." "You probably want to review the file, though."
} }
fi fi
@ -436,35 +474,34 @@ then {
then DOREG=yes then DOREG=yes
fi fi
} }
elif [ -z "$CROOT" ]
then {
echo
echo "Reading current Wine configuration from $CONF..."
CROOT=`sed -n '/^\[Drive C\]$/,/^\[.*\]$/ s/^"Path" = \(.*\)/\1/p' $CONF`
echo "Drive C is configured at $CROOT."
}
fi fi
echo echo
# if root ask the user if they want to setup a local config file and #install the local config file $LCONF
#registry if [ "$DOLOCALCONF" = 'yes' ]
if [ `whoami` = 'root' ] then
then { if [ ! -w ~/.wine ]
echo "You are running wineinstall as root. Do you want to create a local config file and install the registry?" then
conf_yesno_answer "(yes/no) " mkdir ~/.wine
if [ "$ANSWER" = 'yes' ]
then {
CONF=~/.wine/config
mkdir -p ~/.wine
sed "s|\"Path\" = \"/c\"\$|\"Path\" = \"${CROOT}\"|" $WINEINI > $CONF
conf_reset_question default_config
conf_question low default_config \
"Created $CONF using default Wine configuration." \
"You probably want to review the file, though."
} else
DOREG=no
fi fi
}
if [ "$CONVCONF" = 'no' ]
then
cp $TMPCONF $LCONF > /dev/null
fi
else
DOREG=no
fi
#install the global config file $GCONF
if [ "$DOGLOBALCONF" = 'yes' ]
then
if [ ! -f $sysconfdir ]
then
mkdir -p $sysconfdir
fi
cp $TMPCONF $GCONF > /dev/null
fi fi
# check whether we need to install default registry # check whether we need to install default registry
@ -498,13 +535,14 @@ then {
fi fi
echo "Preparing to install default Wine registry entries..." echo "Preparing to install default Wine registry entries..."
# create a temporary wineinstall.conf file using ttydrv, # edit config files so we don't have to run regapi under X
# so that we don't have to run regapi under X
if [ "$CONVCONF" = 'yes' ] if [ "$CONVCONF" = 'yes' ]
then then
sed "s/GraphicsDriver=.*/GraphicsDriver=ttydrv/" $WINEINI > $TMPCONF mv $WINEINI $WINEINI.new
sed "s/GraphicsDriver=.*/GraphicsDriver=ttydrv/" $WINEINI.new > $WINEINI
else else
sed "s/\"GraphicsDriver\" = .*/\"GraphicsDriver\" = \"ttydrv\"/" $CONF > $TMPCONF mv $LCONF $LCONF.new
sed "s/\"GraphicsDriver\" = .*/\"GraphicsDriver\" = \"ttydrv\"/" $LCONF.new > $LCONF
fi fi
# create a temporary wineinstall.reg with fixed debugger path # create a temporary wineinstall.reg with fixed debugger path
@ -512,30 +550,51 @@ then {
echo "Installing default Wine registry entries..." echo "Installing default Wine registry entries..."
echo echo
if ! $REGAPI --config $TMPCONF setValue < $TMPREG > /dev/null if ! $REGAPI setValue < $TMPREG > /dev/null
then { then {
rm -f $TMPCONF $TMPREG rm -f $TMPREG
echo "Registry install failed." echo "Registry install failed."
conf_reset_question regapi_error conf_reset_question regapi_error
conf_question high regapi_error conf_question high regapi_error
exit 1 exit 1
} }
else { else {
echo # if we are converting from a .winerc file, running regapi once
echo "Registry entries successfully installed." # will ONLY convert .winerc -> ~/.wine/config, it will not import the
# registry data. so if we are converting we need to run regapi twice
if [ "$CONVCONF" = 'yes' ]
then
if ! $REGAPI setValue < $TMPREG > /dev/null
then
rm -f $TMPREG
echo "Registry install failed."
conf_reset_question regapi_error
conf_question high regapi_error
exit 1
else
echo
echo "Registry entries successfully installed."
fi
else
echo
echo "Registry entries successfully installed."
fi
} }
fi fi
rm -f $TMPCONF $TMPREG rm -f $TMPREG
if [ "$SYSREG" = 'auto' ] if [ "$SYSREG" = 'auto' ]
then SYSREG=yes then SYSREG=yes
fi fi
# if we converted we need to change the graphics driver back # if we converted we need to change the graphics driver back and
# restore the original .winerc file
if [ "$CONVCONF" = 'yes' ] if [ "$CONVCONF" = 'yes' ]
then then
sed "s/\"GraphicsDriver\" = .*/\"GraphicsDriver\" = \"x11drv\"/" $CONF > $CONF.new mv $WINEINI.new $WINEINI
mv $CONF.new $CONF
fi fi
sed "s/\"GraphicsDriver\" = .*/\"GraphicsDriver\" = \"x11drv\"/" $LCONF > $LCONF.new
mv $LCONF.new $LCONF
} }
fi fi
@ -560,6 +619,15 @@ then {
} }
fi fi
# cleanup any temporary files that may remain
if [ -f $TMPCONF ]
then rm -f $TMPCONF
fi
if [ -f $TMPREG ]
then rm -f $TMPREG
fi
# it's a wrap # it's a wrap
echo echo
echo "Installation complete for now. Good luck (this is still alpha software)." echo "Installation complete for now. Good luck (this is still alpha software)."