wineinstall didn't create the default no-windows directory /c
when just pressing enter.
This commit is contained in:
parent
7897de4ef8
commit
6dc005488b
@ -75,6 +75,10 @@ TMPREG=/tmp/wineinstall.reg
|
|||||||
|
|
||||||
# functions
|
# functions
|
||||||
|
|
||||||
|
function std_sleep {
|
||||||
|
sleep 1
|
||||||
|
}
|
||||||
|
|
||||||
function conf_question {
|
function conf_question {
|
||||||
# parameters: $1 = importance, $2 = question-id, $3+ = message lines
|
# parameters: $1 = importance, $2 = question-id, $3+ = message lines
|
||||||
# the first two parameters can be used by e.g. debconf in debian packages
|
# the first two parameters can be used by e.g. debconf in debian packages
|
||||||
@ -157,6 +161,7 @@ fi
|
|||||||
if [ -f config.cache ] && [ -f Makefile ] && [ Makefile -nt configure ]
|
if [ -f config.cache ] && [ -f Makefile ] && [ Makefile -nt configure ]
|
||||||
then {
|
then {
|
||||||
echo "I see that WINE has already been configured, so I'll skip that."
|
echo "I see that WINE has already been configured, so I'll skip that."
|
||||||
|
std_sleep
|
||||||
# load configure results
|
# load configure results
|
||||||
. ./config.cache
|
. ./config.cache
|
||||||
}
|
}
|
||||||
@ -196,11 +201,13 @@ fi
|
|||||||
if [ -f wine ] && [ wine -nt Makefile ]
|
if [ -f wine ] && [ wine -nt Makefile ]
|
||||||
then {
|
then {
|
||||||
echo "Hmm, looks like WINE is already compiled. I'll skip that too, I guess."
|
echo "Hmm, looks like WINE is already compiled. I'll skip that too, I guess."
|
||||||
|
std_sleep
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
echo "Compiling WINE. Grab a lunch or two, rent a video, or whatever,"
|
echo "Compiling WINE. Grab a lunch or two, rent a video, or whatever,"
|
||||||
echo "in the meantime..."
|
echo "in the meantime..."
|
||||||
echo
|
echo
|
||||||
|
std_sleep
|
||||||
if ! { make depend && make; }
|
if ! { make depend && make; }
|
||||||
then {
|
then {
|
||||||
echo
|
echo
|
||||||
@ -233,6 +240,7 @@ then {
|
|||||||
else {
|
else {
|
||||||
echo "Now installing binaries onto the system..."
|
echo "Now installing binaries onto the system..."
|
||||||
echo
|
echo
|
||||||
|
std_sleep
|
||||||
if ! make install
|
if ! make install
|
||||||
then {
|
then {
|
||||||
echo
|
echo
|
||||||
@ -358,17 +366,18 @@ then {
|
|||||||
"Configuring Wine without Windows." \
|
"Configuring Wine without Windows." \
|
||||||
"Some fake Windows directories must be created, to hold any .ini files, DLLs," \
|
"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." \
|
"start menu entries, and other things your applications may need to install." \
|
||||||
"Where would oyu like your fake C drive to be placed?"
|
"Where would you like your fake C drive to be placed?"
|
||||||
while [ -z "$CROOT" ]
|
while [ -z "$CROOT" ]
|
||||||
do {
|
do {
|
||||||
conf_string_answer "(default is $DCROOT) "
|
conf_string_answer "(default is $DCROOT) "
|
||||||
if [ -z "$ANSWER" ]
|
[ -z "$ANSWER" ] && ANSWER="$DCROOT"
|
||||||
then CROOT="$DCROOT"
|
if ! [ -d "$ANSWER" ]
|
||||||
elif ! [ -d "$ANSWER" ]
|
|
||||||
then {
|
then {
|
||||||
if mkdir -p "$ANSWER"
|
if mkdir -p "$ANSWER"
|
||||||
then CROOT="$ANSWER"
|
then CROOT="$ANSWER"
|
||||||
else conf_reset_question drivec_path
|
else
|
||||||
|
echo "Directory $ANSWER can't be created !"
|
||||||
|
conf_reset_question drivec_path
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
else CROOT="$ANSWER"
|
else CROOT="$ANSWER"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user