From 933c53a67d04b9418e54286b1ff19f8b89655941 Mon Sep 17 00:00:00 2001 From: Nick Daly 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. --- includes/autoinstall-includes.sh | 74 +++++++++++++++++++++++++++++++++++----- includes/generic-includes.sh | 1 + 2 files changed, 67 insertions(+), 8 deletions(-) (limited to 'includes') 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 From 1d5ba1b928aaef6ee43955dd3d53f1b0df1329a2 Mon Sep 17 00:00:00 2001 From: Nick Daly Date: Tue, 2 Feb 2010 21:03:07 -0600 Subject: Installations are now saved in a simple registry. Also, quoted a few variables in auto-installer for fun. --- includes/autoinstall-includes.sh | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'includes') diff --git a/includes/autoinstall-includes.sh b/includes/autoinstall-includes.sh index fe503a0..cff3499 100644 --- a/includes/autoinstall-includes.sh +++ b/includes/autoinstall-includes.sh @@ -107,6 +107,9 @@ function recommendcfg STARTCD=1 fi + gemrbDir="~/.gemrb" + installRegistry="${gemrbDir}/installations.ini" + displayText="To play the game with GemRB, you will need to add the following\n" displayText=${displayText}"lines to your GemRB.cfg file:\n" @@ -137,4 +140,9 @@ function recommendcfg else echo -e "$displayText" fi + + # record the installation in the installation registry. + mkdir "$gemrbDir" + touch "$installRegistry" + echo "$TARGETDIR" >> "$installRegistry" } -- cgit v1.2.3 From 4bceb4ab46d2c9a94193fbe900a6adfc62452fc7 Mon Sep 17 00:00:00 2001 From: Nick Daly Date: Sun, 7 Feb 2010 16:13:09 -0600 Subject: Corrected query function after including POL broke it. --- includes/autoinstall-includes.sh | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) (limited to 'includes') diff --git a/includes/autoinstall-includes.sh b/includes/autoinstall-includes.sh index cff3499..f4be783 100644 --- a/includes/autoinstall-includes.sh +++ b/includes/autoinstall-includes.sh @@ -19,7 +19,6 @@ ### functions ### -# a simplified version of query() from sorcery # $1 = question # $2 = default boolean answer [yYnN] # $3 = title @@ -28,13 +27,48 @@ function query { # usage: query 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] " + read -n 1 RESPONSE + echo + + RESPONSE=${RESPONSE:=$2} + case $RESPONSE in + n|N) return 1 ;; + y|Y) return 0 ;; + esac + done +} + +# a simplified version of query() from sorcery +# $1 = question +# $2 = default boolean answer [yYnN] +# $3 = title +# $4 = long explanation +function new_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" + return $RESPONSE } # a simplified version of query(), modified for PoL. -- cgit v1.2.3 From c0eac1c5a92cba284913d6606034527ec8873424 Mon Sep 17 00:00:00 2001 From: Nick Daly Date: Sun, 7 Feb 2010 20:49:56 -0600 Subject: Registry commands now properly hide error messages. --- includes/autoinstall-includes.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'includes') diff --git a/includes/autoinstall-includes.sh b/includes/autoinstall-includes.sh index f4be783..88fd796 100644 --- a/includes/autoinstall-includes.sh +++ b/includes/autoinstall-includes.sh @@ -141,7 +141,7 @@ function recommendcfg STARTCD=1 fi - gemrbDir="~/.gemrb" + gemrbDir="${HOME}/.gemrb" installRegistry="${gemrbDir}/installations.ini" displayText="To play the game with GemRB, you will need to add the following\n" @@ -176,7 +176,7 @@ function recommendcfg fi # record the installation in the installation registry. - mkdir "$gemrbDir" - touch "$installRegistry" - echo "$TARGETDIR" >> "$installRegistry" + mkdir "$gemrbDir" 2>/dev/null + touch "$installRegistry" 2>/dev/null + echo "$TARGETDIR" 2>/dev/null >> "$installRegistry" } -- cgit v1.2.3 From bd2a182caf12caec92f188ff848676e808819f64 Mon Sep 17 00:00:00 2001 From: Nick Daly Date: Sun, 7 Feb 2010 23:45:30 -0600 Subject: Added TOB and HOW patches. --- includes/cd-list.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'includes') diff --git a/includes/cd-list.sh b/includes/cd-list.sh index 8acf905..b090cd7 100644 --- a/includes/cd-list.sh +++ b/includes/cd-list.sh @@ -64,8 +64,8 @@ function get_game FULLGAMENAME="Baldurs Gate 2 - Throne of Bhaal: 1CD US version" SHORTGAMENAME="baldursgate2soa" MINSCRIPT="bg2/install-tob-1cd-us-minimal.sh" - PATCHES="" # TODO: fill in patches - # bg2/install-patch-totsc-uk.sh bg1/install-patch-baldurdash-fix.sh bg1/install-patch-totsc-baldurdash-text.sh" + PATCHES="bg2/install-tob-patch-us.sh" + # "bg1/install-patch-baldurdash-fix.sh bg1/install-patch-totsc-baldurdash-text.sh" WINDOWSFILES="autorun.ini bgconfig.exe bgdxtest.exe bggltest.exe bgmain.exe charview.exe glsetup.exe update.url earthlink gamespy" CDNO=1 CDSTART=5 -- cgit v1.2.3