new flag, -n, which skips installing RHVoice for people who don't want to use it. Also, RHVoice should not longer reinstall in bottles that already have it.
This commit is contained in:
parent
a9a6e1689f
commit
615dd39033
@ -510,6 +510,21 @@ winetricks() {
|
|||||||
${cache}/winetricks "$@"
|
${cache}/winetricks "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
install_rhvoice() {
|
||||||
|
if [[ -d "$HOME/.local/wine/${bottle}/drive_c/Program Files/Olga Yakovleva/" ]]; then
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
if [[ "$norh" == "true" ]]; then
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
download "https://rhvoice.eu-central-1.linodeobjects.com/RHVoice-voice-English-Bdl-v4.1.9-setup.exe"
|
||||||
|
winetricks -q win8
|
||||||
|
echo "Installing RHVoice..."
|
||||||
|
wine "${cache}/RHVoice-voice-English-Bdl-v4.1.9-setup.exe" &
|
||||||
|
sleep 20
|
||||||
|
wineserver -k
|
||||||
|
}
|
||||||
|
|
||||||
install_wine_bottle() {
|
install_wine_bottle() {
|
||||||
# 32 bit installations work best and are the default here, if you need to override it, do it in the game specific installation steps.
|
# 32 bit installations work best and are the default here, if you need to override it, do it in the game specific installation steps.
|
||||||
export WINEARCH="${WINEARCH:-win32}"
|
export WINEARCH="${WINEARCH:-win32}"
|
||||||
@ -540,12 +555,7 @@ install_wine_bottle() {
|
|||||||
wine msiexec /i z:"$monoPath" /quiet
|
wine msiexec /i z:"$monoPath" /quiet
|
||||||
wine msiexec /i z:"$geckoPath" /quiet
|
wine msiexec /i z:"$geckoPath" /quiet
|
||||||
if [[ "${*}" =~ speechsdk ]]; then
|
if [[ "${*}" =~ speechsdk ]]; then
|
||||||
download "https://rhvoice.eu-central-1.linodeobjects.com/RHVoice-voice-English-Bdl-v4.1.9-setup.exe"
|
install_rhvoice
|
||||||
winetricks -q win8
|
|
||||||
echo "Installing RHVoice..."
|
|
||||||
wine "${cache}/RHVoice-voice-English-Bdl-v4.1.9-setup.exe" &
|
|
||||||
sleep 20
|
|
||||||
wineserver -k
|
|
||||||
fi
|
fi
|
||||||
winetricks -q $@ ${winVer:-winxp} ${winetricksSettings}; } | dialog --progressbox "Installing wine bottle, please wait..." -1 -1
|
winetricks -q $@ ${winVer:-winxp} ${winetricksSettings}; } | dialog --progressbox "Installing wine bottle, please wait..." -1 -1
|
||||||
else
|
else
|
||||||
@ -1029,6 +1039,7 @@ declare -A command=(
|
|||||||
[L]="Display license information."
|
[L]="Display license information."
|
||||||
[l:]="Launch given game without interactive audiogame-manager menu specified by its wine bottle."
|
[l:]="Launch given game without interactive audiogame-manager menu specified by its wine bottle."
|
||||||
[N]="No cache, delete the installer after it has been extracted."
|
[N]="No cache, delete the installer after it has been extracted."
|
||||||
|
[n]="No RHVoice, do not install RHVoice when the game is installed."
|
||||||
[P]="Print a list of packages required by audiogame-manager."
|
[P]="Print a list of packages required by audiogame-manager."
|
||||||
[R]="Redownload. Removes old versions of packages from cache before installing."
|
[R]="Redownload. Removes old versions of packages from cache before installing."
|
||||||
[r]="Remove a game. This will delete all game data."
|
[r]="Remove a game. This will delete all game data."
|
||||||
@ -1055,6 +1066,7 @@ while getopts "${args}" i ; do
|
|||||||
L) license;;
|
L) license;;
|
||||||
l) game_launcher "${OPTARG}";;
|
l) game_launcher "${OPTARG}";;
|
||||||
N) noCache="true";;
|
N) noCache="true";;
|
||||||
|
n) norh="true";;
|
||||||
P) checklist quiet;;
|
P) checklist quiet;;
|
||||||
R) redownload="true";;
|
R) redownload="true";;
|
||||||
r) game_removal;;
|
r) game_removal;;
|
||||||
|
Loading…
Reference in New Issue
Block a user