Merge branch 'testing' in preparation for binary release.
This commit is contained in:
		| @@ -210,7 +210,7 @@ checklist() { | |||||||
|     if command -v xdotool &> /dev/null ; then |     if command -v xdotool &> /dev/null ; then | ||||||
|         echo "Xdotool is installed." |         echo "Xdotool is installed." | ||||||
|     else |     else | ||||||
|         errorList+=("Warning: Xdotool is not installed. Some installlers may not work or may need manual intervention.") |         errorList+=("Warning: Xdotool is not installed. Some installers may not work or may need manual intervention.") | ||||||
|     fi |     fi | ||||||
|     # Show the results |     # Show the results | ||||||
|     if [[ ${#errorList[@]} -eq 0 ]]; then |     if [[ ${#errorList[@]} -eq 0 ]]; then | ||||||
| @@ -286,15 +286,15 @@ echo "Loading documentation, please wait..." | |||||||
|     # Try to find documentation based on common naming conventions. |     # Try to find documentation based on common naming conventions. | ||||||
|     local gamePath="$(winepath -u "$2" 2> /dev/null)" |     local gamePath="$(winepath -u "$2" 2> /dev/null)" | ||||||
|     gamePath="${gamePath%/*}" |     gamePath="${gamePath%/*}" | ||||||
|     local gameDoc="$(find "$gamePath" -type f -iname 'user_manual.html' | head -1)" |     local gameDoc="$(find "$gamePath" -type f -iname 'user_manual.html' -or -iname 'user_manual.htm' | head -1)" | ||||||
|     if [[ -z "$gameDoc" ]]; then |     if [[ -z "$gameDoc" ]]; then | ||||||
|         gameDoc="$(find "$gamePath" -type f -iname 'manual.html' | head -1)" |         gameDoc="$(find "$gamePath" -type f -iname 'manual.html' -or -iname 'manual.htm' | head -1)" | ||||||
|     fi |     fi | ||||||
|     if [[ -z "$gameDoc" ]]; then |     if [[ -z "$gameDoc" ]]; then | ||||||
|         gameDoc="$(find "$gamePath" -type f -iname 'en.html' | head -1)" |         gameDoc="$(find "$gamePath" -type f -iname 'en.html' -or -iname 'en.htm' | head -1)" | ||||||
|     fi |     fi | ||||||
|     if [[ -z "$gameDoc" ]]; then |     if [[ -z "$gameDoc" ]]; then | ||||||
|         gameDoc="$(find "$gamePath" -type f -iname 'readme.html' | head -1)" |         gameDoc="$(find "$gamePath" -type f -iname 'readme.html' -or -iname 'readme.htm' | head -1)" | ||||||
|     fi |     fi | ||||||
|     if [[ -z "$gameDoc" ]]; then |     if [[ -z "$gameDoc" ]]; then | ||||||
|         gameDoc="$(find "$gamePath" -type f -iname 'manual.txt' | head -1)" |         gameDoc="$(find "$gamePath" -type f -iname 'manual.txt' | head -1)" | ||||||
| @@ -522,6 +522,10 @@ game_launcher() { | |||||||
|         if [[ "$game" =~ sequence-storm ]]; then |         if [[ "$game" =~ sequence-storm ]]; then | ||||||
|             [[ -x ~/.SequenceStormReader ]] && ~/.SequenceStormReader & |             [[ -x ~/.SequenceStormReader ]] && ~/.SequenceStormReader & | ||||||
|         fi |         fi | ||||||
|  |         if [[ "$game" =~ audiodisc ]]; then | ||||||
|  |             wine "$winePath\\$wineExec" | ||||||
|  |             exit 0 | ||||||
|  |         fi | ||||||
|         if [[ "$game" =~ audioquake ]]; then |         if [[ "$game" =~ audioquake ]]; then | ||||||
|             wine "$winePath\\$wineExec" |             wine "$winePath\\$wineExec" | ||||||
|             exit 0 |             exit 0 | ||||||
| @@ -617,6 +621,7 @@ gameList=( | |||||||
|     "Finger Panic" |     "Finger Panic" | ||||||
|     "Fuck That Bird" |     "Fuck That Bird" | ||||||
|     "GMA Tank Commander" |     "GMA Tank Commander" | ||||||
|  |     "Golden Crayon" | ||||||
|     "Hammer of Glory" |     "Hammer of Glory" | ||||||
|     "Hunter" |     "Hunter" | ||||||
|     "Insect Therapy" |     "Insect Therapy" | ||||||
| @@ -929,6 +934,14 @@ case "${game}" in | |||||||
|         unzip -d "$WINEPREFIX/drive_c/Program Files/fuck that bird" "${cache}/bird_en.zip" |         unzip -d "$WINEPREFIX/drive_c/Program Files/fuck that bird" "${cache}/bird_en.zip" | ||||||
|         add_launcher "c:\Program Files\fuck that bird/game.exe" |         add_launcher "c:\Program Files\fuck that bird/game.exe" | ||||||
|     ;; |     ;; | ||||||
|  |     "Golden Crayon") | ||||||
|  |         export winVer="win7" | ||||||
|  |         install_wine_bottle speechsdk | ||||||
|  |         download "http://tunmi13.ddns.net/projects/golden_crayon.zip" | ||||||
|  |         unzip -d "$WINEPREFIX/drive_c/Program Files/" "${cache}/golden_crayon.zip" | ||||||
|  |         find "${WINEPREFIX}" -type f -name "nvdaControllerClient32.dll" -exec rm -fv "{}" \; | ||||||
|  |         add_launcher "c:\Program Files\\golden_crayon/gc.exe" | ||||||
|  |     ;; | ||||||
|     "GMA Tank Commander") |     "GMA Tank Commander") | ||||||
|         install_wine_bottle vb6run dx8vb speechsdk |         install_wine_bottle vb6run dx8vb speechsdk | ||||||
|         download "http://www.gmagames.com/gtc120.exe" |         download "http://www.gmagames.com/gtc120.exe" | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user