|
@@ -410,7 +410,7 @@ case $1 in
|
|
fcChange=$(echo "${updated}" | grep "frontend/dist/config/template.json")
|
|
fcChange=$(echo "${updated}" | grep "frontend/dist/config/template.json")
|
|
bcChange=$(echo "${updated}" | grep "backend/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 [[ ( $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
|
|
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}"
|
|
echo -e "${RED}musare.sh has been modified, please reset or commit these changes and run the update command again to continue.${NC}"
|
|
else
|
|
else
|