Merge pull request #116 from Islandora-Devops/mac-patch-sed

Stupid mac tricks: Sed has different syntax on a mac and should be replaced with Perl
jhu-idc · Oct 7, 2020 · 89bcc2f · 89bcc2f
2 parents 739693a + 34a1dd4
commit 89bcc2f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -292,19 +292,19 @@ dev:
 	$(MAKE) download-default-certs
 	$(MAKE) create-codebase-from-demo
 	if grep -q DRUPAL_DEFAULT_CONFIGDIR docker-compose.env.yml; then \
-		sed -i 's/DRUPAL_DEFAULT_CONFIGDIR:.*/DRUPAL_DEFAULT_CONFIGDIR: \/var\/www\/drupal\/config\/sync/g' docker-compose.env.yml; \
+		perl -i -pe's/DRUPAL_DEFAULT_CONFIGDIR:.*/DRUPAL_DEFAULT_CONFIGDIR: \/var\/www\/drupal\/config\/sync/g'  docker-compose.env.yml; \
 	else \
-		sed -i '/DRUPAL_DEFAULT_SALT/a \ \ \ \ \ \ DRUPAL_DEFAULT_CONFIGDIR: \/var\/www\/drupal\/config\/sync' docker-compose.env.yml; \
+		perl -i -pe's/DRUPAL_DEFAULT_SALT/DRUPAL_DEFAULT_CONFIGDIR: \/var\/www\/drupal\/config\/sync\n\ \ \ \ \ \ DRUPAL_DEFAULT_SALT/g' docker-compose.env.yml; \
 	fi
 	if grep -q  DRUPAL_DEFAULT_INSTALL_EXISTING_CONFIG docker-compose.env.yml; then \
-		sed -i 's/DRUPAL_DEFAULT_INSTALL_EXISTING_CONFIG:.*/DRUPAL_DEFAULT_INSTALL_EXISTING_CONFIG: "true"/g' docker-compose.env.yml; \
+		perl -i -pe's/DRUPAL_DEFAULT_INSTALL_EXISTING_CONFIG:.*/DRUPAL_DEFAULT_INSTALL_EXISTING_CONFIG: "true"/g' docker-compose.env.yml; \
 	else \
-		sed -i '/DRUPAL_DEFAULT_SALT/a \ \ \ \ \ \ DRUPAL_DEFAULT_INSTALL_EXISTING_CONFIG: "true"' docker-compose.env.yml; \
+		perl -i -pe's/DRUPAL_DEFAULT_SALT/DRUPAL_DEFAULT_INSTALL_EXISTING_CONFIG: "true"\n\ \ \ \ \ \ DRUPAL_DEFAULT_SALT/g' docker-compose.env.yml; \
 	fi
 	if grep -q  DRUPAL_DEFAULT_PROFILE docker-compose.env.yml; then \
-		sed -i 's/DRUPAL_DEFAULT_PROFILE:.*/DRUPAL_DEFAULT_PROFILE: minimal/g' docker-compose.env.yml; \
+		perl -i -pe's/DRUPAL_DEFAULT_PROFILE:.*/DRUPAL_DEFAULT_PROFILE: minimal/g' docker-compose.env.yml; \
 	else \
-		sed -i '/DRUPAL_DEFAULT_SALT/a \ \ \ \ \ \ DRUPAL_DEFAULT_PROFILE: minimal' docker-compose.env.yml; \
+	  perl -i -pe's/DRUPAL_DEFAULT_SALT/DRUPAL_DEFAULT_PROFILE: minimal\n\ \ \ \ \ \ DRUPAL_DEFAULT_SALT/g' docker-compose.env.yml; \
 	fi
 	$(MAKE) -B docker-compose.yml ENVIRONMENT=local
 	docker-compose up -d

diff --git a/README.md b/README.md
@@ -65,6 +65,7 @@ first after you have completed the [Installation](#-installation).
 - Git 2.0+
 - GNU Make 4.0+
 - PHP 7.2+ (*Also requires the same ext packages you intend to use in your site.*)
+- Perl (if you want to run `make dev` which does find-and-replace in some files with Perl)
 
 ## Installation