Browse Source

fix(musare.sh): update musare.sh stuck in loop

Owen Diffey 2 years ago
parent
commit
59e91bbde7
1 changed files with 1 additions and 1 deletions
  1. 1 1
      musare.sh

+ 1 - 1
musare.sh

@@ -410,7 +410,7 @@ case $1 in
         fcChange=$(echo "${updated}" | grep "frontend/dist/config/template.json")
         bcChange=$(echo "${updated}" | grep "backend/config/template.json")
         if [[ ( $2 == "auto" && -z $dbChange && -z $fcChange && -z $bcChange && -z $musareshChange ) || -z $2 ]]; then
-            if [[ -n $musareshChange ]]; then
+            if [[ -n $musareshChange && $(git diff @\{u\} -- musare.sh) != "" ]]; then
                 if [[ $(git diff HEAD -- musare.sh) != "" ]]; then
                     echo -e "${RED}musare.sh has been modified, please reset or commit these changes and run the update command again to continue.${NC}"
                 else