Islandora-Devops / isle-dc

ISLE 8 - Dockerized Islandora 8 Deployment orchestrated with docker-compose
MIT License
23 stars 60 forks source link

organized Makefile #322

Closed joshdentremont closed 1 year ago

joshdentremont commented 1 year ago

I've been working with the Makefile a lot recently, and thought it would be nice to have all the different rules grouped by function. Previously things appeared to be in the order they had been added to the file, but since the makefile is now so large I thought this might be a useful change. I have grouped together the different rules for making a new site (demo, local, starter, starter_dev), put all the variables together, added groupings for backups, helpers, etc.

Nothing was removed, but everything has been moved around. I also added a few comments to rules that didn't have them.

DonRichards commented 1 year ago

@joshdentremont Are you able to resolve the merge conflicts?

DonRichards commented 1 year ago
Screenshot 2023-03-15 at 11 53 13 AM

Looks like there's an error with awk: cmd. line:1: warning: regexp escape sequence_' is not a known regexp operator`

This may not be associated with your PR and is a leftover from a previous one but the issue is with the 2 lines with this. Removing this back slash worked on my local (mac)

@awk '/^[a-zA-Z\-\_0-9]+:/ { \

@awk '/^[a-zA-Z\-_0-9]+:/ { \

Would you mind adding it to this PR?

joshdentremont commented 1 year ago

@DonRichards Done & done, thanks