From d01be25bc0a5be81bb197ef3357fa9c2b612b2ee Mon Sep 17 00:00:00 2001
From: Samuel <37722993+ipuppet@users.noreply.github.com>
Date: Wed, 29 May 2024 20:00:46 +0800
Subject: [PATCH] fix: Correct Python installation check and download success
 check logic (#2080)

* fix: python installation check logic (fix #2073)

* fix: download success check logic (fix #2074)
---
 run.sh            | 2 +-
 tools/dlmodels.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/run.sh b/run.sh
index 8710ba3..acb70ed 100755
--- a/run.sh
+++ b/run.sh
@@ -14,7 +14,7 @@ else
   requirements_file="requirements.txt"
 
   # Check if Python 3.8 is installed
-  if ! command -v python3.8 >/dev/null 2>&1 || pyenv versions --bare | grep -q "3.8"; then
+  if ! (command -v python3.8 >/dev/null 2>&1 || pyenv versions --bare | grep -q "3.8"); then
     echo "Python 3 not found. Attempting to install 3.8..."
     if [ "$(uname)" = "Darwin" ] && command -v brew >/dev/null 2>&1; then
       brew install python@3.8
diff --git a/tools/dlmodels.sh b/tools/dlmodels.sh
index 2848e51..dddf519 100755
--- a/tools/dlmodels.sh
+++ b/tools/dlmodels.sh
@@ -34,7 +34,7 @@ check_file_pretrained() {
       echo failed. starting download from huggingface.
       if command -v aria2c > /dev/null 2>&1; then
           aria2c --console-log-level=error -c -x 16 -s 16 -k 1M https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main/"$1"/"$2" -d ./assets/"$1" -o "$2"
-          [ -f "./assets/""$1""/""$2""" ] && echo "download successful." || echo "please try again!" && exit 1
+          [ -f "./assets/""$1""/""$2""" ] && echo "download successful." || (echo "please try again!" && exit 1)
       else
           echo "aria2c command not found. Please install aria2c and try again."
           exit 1
@@ -50,7 +50,7 @@ check_file_special() {
       echo failed. starting download from huggingface.
       if command -v aria2c > /dev/null 2>&1; then
           aria2c --console-log-level=error -c -x 16 -s 16 -k 1M https://huggingface.co/lj1995/VoiceConversionWebUI/resolve/main/"$2" -d ./assets/"$1" -o "$2"
-          [ -f "./assets/""$1""/""$2""" ] && echo "download successful." || echo "please try again!" && exit 1
+          [ -f "./assets/""$1""/""$2""" ] && echo "download successful." || (echo "please try again!" && exit 1)
       else
           echo "aria2c command not found. Please install aria2c and try again."
           exit 1