Fix download-dependencies.sh loops

This commit is contained in:
Michael Hansen
2019-12-07 23:02:11 -05:00
parent 16d7c3a24a
commit 9f8babff34
3 changed files with 6 additions and 6 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
Package: rhasspy-server
Version: 2.4.8
Version: 2.4.10
Section: utils
Priority: optional
Depends: sox,alsa-utils,espeak,libstdc++6,jq,xz-utils,unzip,curl,sphinxbase-utils,sphinxtrain,flite,libatlas-base-dev,gfortran
+2 -2
View File
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
rhasspy_version="2.4.8"
rhasspy_version="2.4.10"
this_dir="$( cd "$( dirname "$0" )" && pwd )"
@@ -131,7 +131,7 @@ cp "${this_dir}/app.py" "${share_dir}/src/"
# -----------------------------------------------------------------------------
echo "Copying Kaldi"
kaldi_src="${venv}/kaldi"
kaldi_src="${this_dir}/opt/kaldi"
if [[ ! -d "${kaldi_src}" ]]; then
echo "Missing Kaldi at ${kaldi_src}"
exit 1
+3 -3
View File
@@ -82,7 +82,7 @@ fi
for FRIENDLY_ARCH in "${FRIENDLY_ARCHS[@]}";
do
rhasspy_files=("rhasspy-tools_${FRIENDLY_ARCH}.tar.gz" "rhasspy-web-dist.tar.gz")
for rhasspy_file_name in "${rhasspy_files}"; do
for rhasspy_file_name in "${rhasspy_files[@]}"; do
rhasspy_file="${download_dir}/${rhasspy_file_name}"
rhasspy_file_url="https://github.com/synesthesiam/rhasspy/releases/download/v2.0/${rhasspy_file_name}"
maybe_download "${rhasspy_file_url}" "${rhasspy_file}"
@@ -110,7 +110,7 @@ maybe_download "${snowboy_url}" "${snowboy_file}"
# -----------------------------------------------------------------------------
if [[ -z "${no_precise}" ]]; then
for CPU_ARCH in "${CPU_ARCHS}";
for CPU_ARCH in "${CPU_ARCHS[@]}";
do
case $CPU_ARCH in
x86_64|armv7l)
@@ -126,7 +126,7 @@ fi
# -----------------------------------------------------------------------------
if [[ -z "${no_kaldi}" ]]; then
for FRIENDLY_ARCH in "${FRIENDLY_ARCHS}"
for FRIENDLY_ARCH in "${FRIENDLY_ARCHS[@]}"
do
# Install pre-built package
kaldi_file="${download_dir}/kaldi_${FRIENDLY_ARCH}.tar.gz"