Merge develop into feature/validateVariables

QuantiModo · Aug 27, 2021 · 3bf2779 · 3bf2779
2 parents 258c090 + 0d585c1
commit 3bf2779
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/scripts/nvm.sh b/scripts/nvm.sh
@@ -10,7 +10,7 @@ PARENT_SCRIPT_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/$(basename "${
 cd "${SCRIPT_FOLDER}" && cd .. && export IONIC_PATH="$PWD" && source "$IONIC_PATH"/scripts/log_start.sh "${BASH_SOURCE[0]}"
 # shellcheck source=./no-root.sh
 source "$SCRIPT_FOLDER"/no-root.sh
-sudo chown -R $USER ~/.nvm
+sudo chown -R $USER ~/.nvm || true
 command -v nvm >/dev/null 2>&1 || {
     echo >&2 "nvm is required, but it's not installed.  Trying to install it now...";
     sudo chown -R "$USER" ~/.nvm || true

diff --git a/src/img/ionic.svg b/src/img/ionic.svg