Added creation of c:/windows/fonts and
c:/windows/Start Menu/Programs/Startup.
This commit is contained in:
Dustin Navea
Alexandre Julliard
parent
c949349cab
commit
3ebea438cc
|
|
@ -174,7 +174,8 @@ function create_windows_directories {
|
||||||
for tdir in "$CROOT/windows" "$CROOT/windows/system" "$CROOT/windows/system32" \
|
for tdir in "$CROOT/windows" "$CROOT/windows/system" "$CROOT/windows/system32" \
|
||||||
"$CROOT/windows/Start Menu" "$CROOT/windows/Start Menu/Programs" \
|
"$CROOT/windows/Start Menu" "$CROOT/windows/Start Menu/Programs" \
|
||||||
"$CROOT/Program Files" "$CROOT/Program Files/Common Files" \
|
"$CROOT/Program Files" "$CROOT/Program Files/Common Files" \
|
||||||
"$CROOT/windows/Profiles" "$CROOT/windows/Profiles/Administrator"
|
"$CROOT/windows/Profiles" "$CROOT/windows/Profiles/Administrator" \
|
||||||
|
"$CROOT/windows/Fonts" "$CROOT/windows/Start Menu/Programs/Startup"
|
||||||
do [ -d "$tdir" ] || mkdir "$tdir"
|
do [ -d "$tdir" ] || mkdir "$tdir"
|
||||||
done
|
done
|
||||||
[ -f "$CROOT/windows/win.ini" ] || cp "$WININI" "$CROOT/windows/win.ini"
|
[ -f "$CROOT/windows/win.ini" ] || cp "$WININI" "$CROOT/windows/win.ini"
|
||||||
|
|
@ -213,202 +214,197 @@ echo
|
||||||
if [ "$BINDIST" = 'no' ]
|
if [ "$BINDIST" = 'no' ]
|
||||||
then {
|
then {
|
||||||
|
|
||||||
if ! [ -f configure ]
|
if ! [ -f configure ]
|
||||||
then {
|
then {
|
||||||
echo "You're running this from the wrong directory."
|
echo "You're running this from the wrong directory."
|
||||||
echo "Change to the Wine source's main directory and try again."
|
echo "Change to the Wine source's main directory and try again."
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
fi
|
|
||||||
|
|
||||||
if [ `whoami` == 'root' ]
|
|
||||||
then {
|
|
||||||
echo "You are running wineinstall as root, this is not advisable. Please rerun as a user."
|
|
||||||
echo "Aborting."
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
fi
|
|
||||||
|
|
||||||
# check whether RPM installed, and if it is, remove any old wine rpm.
|
|
||||||
hash rpm &>/dev/null
|
|
||||||
RET=$?
|
|
||||||
if [ $RET -eq 0 ]; then
|
|
||||||
if [ -n "`rpm -qi wine 2>/dev/null|grep "^Name"`" ]; then
|
|
||||||
echo "Warning: Old Wine RPM install detected. Do you want to remove it first?"
|
|
||||||
conf_yesno_answer "(yes/no) "
|
|
||||||
if [ "$ANSWER" = 'yes' ]; then
|
|
||||||
echo "We need to remove the rpm as root, please enter your root password"
|
|
||||||
echo
|
|
||||||
echo Starting wine rpm removal...
|
|
||||||
su -c "rpm -e wine; RET=$?"
|
|
||||||
if [ $RET -eq 0 ]; then
|
|
||||||
echo Done.
|
|
||||||
else
|
|
||||||
echo "FAILED. Probably you aren't installing as root."
|
|
||||||
echo "Expect problems (library conflicts with existing install etc.)."
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo "Sorry, I won't install Wine when an rpm version is still installed."
|
|
||||||
echo "(Wine support suffered from way too many conflicts between RPM"
|
|
||||||
echo "and source installs)"
|
|
||||||
echo "Have a nice day !"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
fi
|
|
||||||
|
|
||||||
# check whether wine binary still available
|
if [ `whoami` == 'root' ]
|
||||||
if [ -n "`which wine 2>/dev/null|grep '/wine'`" ]; then
|
then {
|
||||||
echo "Warning !! wine binary (still) found, which may indicate"
|
echo "You are running wineinstall as root, this is not advisable. Please rerun as a user."
|
||||||
echo "a (conflicting) previous installation."
|
echo "Aborting."
|
||||||
echo "You might want to abort and uninstall Wine first."
|
exit 1
|
||||||
std_sleep
|
}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# run the configure script, if necessary
|
# check whether RPM installed, and if it is, remove any old wine rpm.
|
||||||
|
hash rpm &>/dev/null
|
||||||
|
RET=$?
|
||||||
|
if [ $RET -eq 0 ]; then
|
||||||
|
if [ -n "`rpm -qi wine 2>/dev/null|grep "^Name"`" ]; then
|
||||||
|
echo "Warning: Old Wine RPM install detected. Do you want to remove it first?"
|
||||||
|
conf_yesno_answer "(yes/no) "
|
||||||
|
if [ "$ANSWER" = 'yes' ]; then
|
||||||
|
echo "We need to remove the rpm as root, please enter your root password"
|
||||||
|
echo
|
||||||
|
echo Starting wine rpm removal...
|
||||||
|
su -c "rpm -e wine; RET=$?"
|
||||||
|
if [ $RET -eq 0 ]; then
|
||||||
|
echo Done.
|
||||||
|
else
|
||||||
|
echo "FAILED. Probably you aren't installing as root."
|
||||||
|
echo "Expect problems (library conflicts with existing install etc.)."
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo "Sorry, I won't install Wine when an rpm version is still installed."
|
||||||
|
echo "(Wine support suffered from way too many conflicts between RPM"
|
||||||
|
echo "and source installs)"
|
||||||
|
echo "Have a nice day !"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if [ -f config.cache ] && [ -f Makefile ] && [ Makefile -nt configure ]
|
# check whether wine binary still available
|
||||||
then {
|
if [ -n "`which wine 2>/dev/null|grep '/wine'`" ]; then
|
||||||
echo
|
echo "Warning !! wine binary (still) found, which may indicate"
|
||||||
echo "I see that WINE has already been configured, so I'll skip that."
|
echo "a (conflicting) previous installation."
|
||||||
std_sleep
|
echo "You might want to abort and uninstall Wine first."
|
||||||
# load configure results
|
std_sleep
|
||||||
. ./config.cache
|
fi
|
||||||
}
|
|
||||||
else {
|
# run the configure script, if necessary
|
||||||
echo "Running configure..."
|
|
||||||
echo
|
if [ -f config.cache ] && [ -f Makefile ] && [ Makefile -nt configure ]
|
||||||
if ! ./configure -C $CONFARGS
|
|
||||||
then {
|
then {
|
||||||
echo
|
echo
|
||||||
echo "Configure failed, aborting install."
|
echo "I see that WINE has already been configured, so I'll skip that."
|
||||||
rm -f config.cache
|
std_sleep
|
||||||
exit 1
|
# load configure results
|
||||||
|
. ./config.cache
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
echo "Running configure..."
|
||||||
|
echo
|
||||||
|
if ! ./configure -C $CONFARGS
|
||||||
|
then {
|
||||||
|
echo
|
||||||
|
echo "Configure failed, aborting install."
|
||||||
|
rm -f config.cache
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
fi
|
||||||
|
# load configure results
|
||||||
|
. ./config.cache
|
||||||
|
# make sure X was found
|
||||||
|
eval "$ac_cv_have_x"
|
||||||
|
if [ "$have_x" != "yes" ]
|
||||||
|
then {
|
||||||
|
echo "Install the X development headers and try again."
|
||||||
|
rm -f config.cache
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
fi
|
fi
|
||||||
# load configure results
|
|
||||||
. ./config.cache
|
# now do the compilation and install, we need to always do this because we
|
||||||
# make sure X was found
|
# don't want the 'make install' command we might run to run 'make' as root
|
||||||
eval "$ac_cv_have_x"
|
if [ `whoami` != 'root' ]
|
||||||
if [ "$have_x" != "yes" ]
|
|
||||||
then {
|
then {
|
||||||
echo "Install the X development headers and try again."
|
# ask the user if they want to build and install wine
|
||||||
rm -f config.cache
|
echo
|
||||||
exit 1
|
echo "We need to install wine as root user, do you want us to build wine,"
|
||||||
}
|
echo "'su root' and install Wine? Enter 'no' to continue without installing"
|
||||||
fi
|
conf_yesno_answer "(yes/no) "
|
||||||
}
|
|
||||||
fi
|
|
||||||
|
|
||||||
# now do the compilation and install, we need to always do this because we
|
if [ "$ANSWER" = "yes" ]
|
||||||
# don't want the 'make install' command we might run to run 'make' as root
|
then {
|
||||||
if [ `whoami` != 'root' ]
|
# start out with the basic command
|
||||||
then {
|
sucommand="make install"
|
||||||
# ask the user if they want to build and install wine
|
|
||||||
echo
|
|
||||||
echo "We need to install wine as root user, do you want us to build wine,"
|
|
||||||
echo "'su root' and install Wine? Enter 'no' to continue without installing"
|
|
||||||
conf_yesno_answer "(yes/no) "
|
|
||||||
|
|
||||||
if [ "$ANSWER" = "yes" ]
|
# if the user doesn't have $libdir in their ld.so.conf add this
|
||||||
then {
|
# to our sucommand string
|
||||||
# start out with the basic command
|
if [ -f /etc/ld.so.conf ]
|
||||||
sucommand="make install"
|
then
|
||||||
|
if ! grep -qs "$libdir" /etc/ld.so.conf
|
||||||
|
then {
|
||||||
|
echo
|
||||||
|
echo "$libdir doesn't exist in your /etc/ld.so.conf, it will be added"
|
||||||
|
echo "when we perform the install..."
|
||||||
|
sucommand="$sucommand;echo $libdir>>/etc/ld.so.conf"
|
||||||
|
}
|
||||||
|
fi
|
||||||
|
# run ldconfig always just in case some updated files dont get linked
|
||||||
|
sucommand="$sucommand;$ac_cv_path_LDCONFIG"
|
||||||
|
fi
|
||||||
|
|
||||||
# if the user doesn't have $libdir in their ld.so.conf add this
|
echo
|
||||||
# to our sucommand string
|
|
||||||
if [ -f /etc/ld.so.conf ]
|
echo "Compiling WINE. Grab a lunch or two, rent a video, or whatever,"
|
||||||
then
|
echo "in the meantime..."
|
||||||
if ! grep -qs "$libdir" /etc/ld.so.conf
|
echo
|
||||||
|
std_sleep
|
||||||
|
|
||||||
|
# try to just make wine, if this fails 'make depend' and try to remake
|
||||||
|
if ! { make; }
|
||||||
then {
|
then {
|
||||||
echo
|
if ! { make depend && make; }
|
||||||
echo "$libdir doesn't exist in your /etc/ld.so.conf, it will be added"
|
then {
|
||||||
echo "when we perform the install..."
|
echo
|
||||||
sucommand="$sucommand;echo $libdir>>/etc/ld.so.conf"
|
echo "Compilation failed, aborting install."
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
fi
|
fi
|
||||||
# run ldconfig always just in case some updated files dont get linked
|
echo
|
||||||
sucommand="$sucommand;$ac_cv_path_LDCONFIG"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo
|
echo "Performing 'make install' as root to install binaries, enter root password"
|
||||||
|
|
||||||
echo "Compiling WINE. Grab a lunch or two, rent a video, or whatever,"
|
std_sleep
|
||||||
echo "in the meantime..."
|
|
||||||
echo
|
|
||||||
std_sleep
|
|
||||||
|
|
||||||
# try to just make wine, if this fails 'make depend' and try to remake
|
if ! su root -c "$sucommand"
|
||||||
if ! { make; }
|
|
||||||
then {
|
|
||||||
if ! { make depend && make; }
|
|
||||||
then {
|
then {
|
||||||
echo
|
echo
|
||||||
echo "Compilation failed, aborting install."
|
echo "Either you entered an incorrect password or we failed to run"
|
||||||
|
echo "'$sucommand' correctly."
|
||||||
|
echo "If you didn't enter an incorrect password then please report this"
|
||||||
|
echo "error and any steps to possibly reproduce it to"
|
||||||
|
echo "http://bugs.winehq.com/"
|
||||||
|
echo
|
||||||
|
echo "Installation failed, aborting."
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
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 {
|
||||||
|
# user didn't want to install wine so tell them about running from the
|
||||||
|
# current directory and set some stuff up for them
|
||||||
|
|
||||||
|
# setup to run from current directory
|
||||||
|
DLLPATH="$PWD/dlls"
|
||||||
|
if [ -z "$LD_LIBRARY_PATH" ]
|
||||||
|
then LD_LIBRARY_PATH="$PWD:$DLLPATH"
|
||||||
|
else LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD:$DLLPATH"
|
||||||
|
fi
|
||||||
|
export LD_LIBRARY_PATH
|
||||||
|
DEBUGGER="$PWD/$HDEBUGGER"
|
||||||
|
echo
|
||||||
|
echo "NOTE! To run Wine without installing, you must set the environment variable"
|
||||||
|
echo "LD_LIBRARY_PATH to $PWD:$DLLPATH"
|
||||||
|
echo "in your logon scripts."
|
||||||
|
echo
|
||||||
}
|
}
|
||||||
fi
|
fi
|
||||||
echo
|
|
||||||
|
|
||||||
echo "Performing 'make install' as root to install binaries, enter root password"
|
|
||||||
|
|
||||||
std_sleep
|
|
||||||
|
|
||||||
if ! su root -c "$sucommand"
|
|
||||||
then {
|
|
||||||
echo
|
|
||||||
echo "Either you entered an incorrect password or we failed to run"
|
|
||||||
echo "'$sucommand' correctly."
|
|
||||||
echo "If you didn't enter an incorrect password then please report this"
|
|
||||||
echo "error and any steps to possibly reproduce it to"
|
|
||||||
echo "http://bugs.winehq.com/"
|
|
||||||
echo
|
|
||||||
echo "Installation failed, aborting."
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
fi
|
|
||||||
|
|
||||||
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 {
|
fi # [ `whoami` != 'root' ]
|
||||||
# user didn't want to install wine so tell them about running from the
|
|
||||||
# current directory and set some stuff up for them
|
|
||||||
|
|
||||||
# setup to run from current directory
|
|
||||||
DLLPATH="$PWD/dlls"
|
|
||||||
if [ -z "$LD_LIBRARY_PATH" ]
|
|
||||||
then LD_LIBRARY_PATH="$PWD:$DLLPATH"
|
|
||||||
else LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD:$DLLPATH"
|
|
||||||
fi
|
|
||||||
export LD_LIBRARY_PATH
|
|
||||||
DEBUGGER="$PWD/$HDEBUGGER"
|
|
||||||
echo
|
|
||||||
echo "NOTE! To run Wine without installing, you must set the environment variable"
|
|
||||||
echo "LD_LIBRARY_PATH to $PWD:$DLLPATH"
|
|
||||||
echo "in your logon scripts."
|
|
||||||
echo
|
|
||||||
}
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
echo "You are running wineinstall as root, this is not advisable. Please rerun as a user."
|
|
||||||
echo "Aborting."
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
fi # [ `whoami` != 'root' ]
|
|
||||||
|
|
||||||
}
|
}
|
||||||
fi # BINDIST
|
fi # BINDIST
|
||||||
|
|
@ -453,7 +449,24 @@ then {
|
||||||
conf_yesno_answer "(yes/no) "
|
conf_yesno_answer "(yes/no) "
|
||||||
DOLOCALCONF="$ANSWER"
|
DOLOCALCONF="$ANSWER"
|
||||||
echo
|
echo
|
||||||
else {
|
if [ "$ANSWER" = "yes" ]
|
||||||
|
then
|
||||||
|
{
|
||||||
|
echo "Would you like to make a backup of this old config file?"
|
||||||
|
conf_yesno_answer "(yes/no) "
|
||||||
|
echo
|
||||||
|
if [ "$ANSWER" = "yes" ]
|
||||||
|
then
|
||||||
|
{
|
||||||
|
echo "Renaming $LCONF to $LCONF.old"
|
||||||
|
mv -f "$LCONF" "$LCONF.old"
|
||||||
|
echo
|
||||||
|
}
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
{
|
||||||
echo "Create local config file ~/.wine/config?"
|
echo "Create local config file ~/.wine/config?"
|
||||||
conf_yesno_answer "(yes/no) "
|
conf_yesno_answer "(yes/no) "
|
||||||
DOLOCALCONF="$ANSWER"
|
DOLOCALCONF="$ANSWER"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue