From 933c53a67d04b9418e54286b1ff19f8b89655941 Mon Sep 17 00:00:00 2001
From: Nick Daly <myownlittlworld@hotmail.com>
Date: Sat, 7 Nov 2009 22:41:08 -0600
Subject: Partially enabled PlayOnLinux.

* Added PlayOnLinux to includes/autoinstall-includes.sh.
* Clarified help-text in includes/generic-includes.sh.
---
 auto-installer.sh                |  3 ++
 includes/autoinstall-includes.sh | 74 +++++++++++++++++++++++++++++++++++-----
 includes/generic-includes.sh     |  1 +
 3 files changed, 70 insertions(+), 8 deletions(-)

diff --git a/auto-installer.sh b/auto-installer.sh
index 586d974..2653863 100755
--- a/auto-installer.sh
+++ b/auto-installer.sh
@@ -30,6 +30,9 @@ source "$scriptdir/includes/cd-includes.sh"
 source "$scriptdir/includes/patch-includes.sh"
 source "$scriptdir/includes/autoinstall-includes.sh"
 source "$scriptdir/includes/cd-list.sh"
+if [ "$PLAYONLINUX" ]; then
+    source "$PLAYONLINUX/lib/sources" > /dev/null 2>&1
+fi
 
 parseargs "$@"
 
diff --git a/includes/autoinstall-includes.sh b/includes/autoinstall-includes.sh
index 9462c80..fe503a0 100644
--- a/includes/autoinstall-includes.sh
+++ b/includes/autoinstall-includes.sh
@@ -22,8 +22,61 @@
 # a simplified version of query() from sorcery
 # $1 = question
 # $2 = default boolean answer [yYnN]
+# $3 = title
+# $4 = long explanation
 function query
 {
+    # usage: query question default [title] [longExplanation]
+
+    if [ "$PLAYONLINUX" ]; then
+        RESPONSE=query_playOnLinux "$1" "$2" "$3" "$4"
+    else
+        RESPONSE=query_text "$1" "$2" "$3" "$4"
+    fi
+
+    return "$RESPONSE"
+}
+
+# a simplified version of query(), modified for PoL.
+# $1 = question
+# $2 = default boolean answer [yYnN]
+# $3 = title
+# $4 = long explanation
+function query_playOnLinux
+{
+    # usage: query_playOnLinux question default [title] [longExplanation]
+
+    if [ "$4" ]; then
+        1="$4
+
+$1"
+    fi
+
+    POL_SetupWindow_question "$1 [$2]" "$3"
+    return "$APP_ANSWER"
+}
+
+# a simplified version of query() from sorcery
+# $1 = question
+# $2 = default boolean answer [yYnN]
+# $3 = title
+# $4 = long explanation
+function query_text
+{
+    # usage: query_text question default [title] [longExplanation]
+
+    if [ "$3" ]; then
+        echo -e "$3"
+        echo "========================================"
+        echo
+    fi
+
+    if [ "$4" ]; then
+        echo -e "$4"
+        echo
+    fi
+
+
 	while true; do
 		RESPONSE=""
 		echo -e -n "$1 [$2] "
@@ -54,10 +107,9 @@ function recommendcfg
         STARTCD=1
     fi
 
-	echo
-	echo "To play the game with GemRB, you will need to add the following"
-	echo "lines to your GemRB.cfg file:"
-	echo
+	displayText="To play the game with GemRB, you will need to add the following\n"
+	displayText=${displayText}"lines to your GemRB.cfg file:\n"
+
 	LINE="GamePath=$TARGETDIR"; echo $LINE
 	if [ $FULLINSTALL -eq 1 ]; then
 		for CDNUMBER in $(seq $STARTCD $(($NUMOFCDS+$STARTCD-1))); do
@@ -66,17 +118,23 @@ function recommendcfg
             else
 			    LINE="CD${CDNUMBER}=${TARGETDIR}"
             fi
-			echo $LINE
+			displayText=${displayText}${LINE}"\n"
 		done
 	else
 		for CDNUMBER in $(seq $STARTCD $(($NUMOFCDS+$STARTCD-1))); do
-			LINE="CD$CDNUMBER=$CDMOUNT/cd$CDNUMBER"
-			echo $LINE
+			LINE="CD${CDNUMBER}=${CDMOUNT}/cd${CDNUMBER}"
+			displayText=${displayText}${LINE}"\n"
 		done
 	fi
 
 	# if startcd exists we can't tell if GameOnCD should be recommended
 	if [ $STARTCD -eq 1 ] ; then
-		[ $FULLINSTALL -eq 1 ] && echo "GameOnCD=0" || echo "GameOnCD=1"
+		[ $FULLINSTALL -eq 1 ] && displayText=${displayText}"GameOnCD=0\n" || displayText=${displayText}"GameOnCD=1\n"
 	fi
+
+    if [ "$PLAYONLINUX" ]; then
+        POL_SetupWindow_message "$displayText" "Setup Complete!"
+    else
+        echo -e "$displayText"
+    fi
 }
diff --git a/includes/generic-includes.sh b/includes/generic-includes.sh
index e90199c..32f8bc0 100644
--- a/includes/generic-includes.sh
+++ b/includes/generic-includes.sh
@@ -180,6 +180,7 @@ function move_and_remove
 {
     # usage: move_and_remove source destination
     # copies the files in the source directory to the destination.
+    # then removes the source entirely.
     if [ "$1" != "$2" ]
     then
         mkdir -p "$2" || die
-- 
cgit v1.2.3