diff --git a/.gitignore b/.gitignore index 28ed869a5..1a52ebe95 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,5 @@ tests/_test* build .build +.deps CMakeSettings.json diff --git a/build.sh b/build.sh index ff5882c8d..cd60f110b 100755 --- a/build.sh +++ b/build.sh @@ -74,7 +74,7 @@ elif [[ "$(uname)" == "Linux" ]] ; then cpu=x64 elif [[ "$(uname)" =~ "Darwin" ]] ; then is_macos=1 - if [[ $(uname -m) == "arm64" ]]; then + if [[ "$(uname -m)" == "arm64" ]] ; then cpu=arm64 else cpu=x64 @@ -384,20 +384,24 @@ if [ ! -f "$pwd/.build/$file_skia_dir" ] ; then else skia_dir="$HOME/deps/$possible_skia_dir_name" fi - + # Set default location if not found if [ ! -d "$skia_dir" ] ; then - echo "" - echo "Skia directory wasn't found." - echo "" + skia_dir="$pwd/.deps/$possible_skia_dir_name" - echo "Select Skia directory to create [$skia_dir]? " - if [ ! $auto ] ; then - read skia_dir_read - if [ "$skia_dir_read" != "" ] ; then - skia_dir="$skia_dir_read" + if [ ! -d "$skia_dir" ] ; then + echo "" + echo "Skia directory wasn't found." + echo "" + + echo "Select Skia directory to create [$skia_dir]? " + if [ ! $auto ] ; then + read skia_dir_read + if [ "$skia_dir_read" != "" ] ; then + skia_dir="$skia_dir_read" + fi fi + mkdir -p $skia_dir || exit 1 fi - mkdir -p $skia_dir || exit 1 fi echo $skia_dir > "$pwd/.build/$file_skia_dir" fi