From 4151bec230cb2d4d9ee97bf961d9357a7e3257f2 Mon Sep 17 00:00:00 2001 From: eostre Date: Fri, 31 Jul 2020 15:50:14 -0400 Subject: [PATCH] makefile: fix typos and minor errors --- dbd-autobuild/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dbd-autobuild/Makefile b/dbd-autobuild/Makefile index d31b2d2..23f8486 100644 --- a/dbd-autobuild/Makefile +++ b/dbd-autobuild/Makefile @@ -5,6 +5,8 @@ chown-www: chown -R www-data:www-data /var/www # recipes for installing this thing onto a "real" (non-chroot) system +# this is enough to get us to a functional Drupal install page +# to go further, use the install-from-backups recipe setup-real-system: probe-files install-pkgs install-drupal do-mysql chown-www # test that we have /install-{drupal-toolchain,packages}.sh /pkgs /sqldefaults and /do-mysql-sh @@ -36,7 +38,7 @@ install-from-backups: probe-backup-files install-sqldump install-drupal-sites ch probe-backup-files: [ -f /sqldump ] - [ -f /sites && -d /sites ] + [ -d /sites ] # [ -f /boycottsony.org.conf ] # [ -f /dayagainstdrm.org.conf ] # [ -f /rotten-apple.org.conf ] @@ -44,7 +46,7 @@ probe-backup-files: install-sqldump: # source the dump twice - once to create the DB, once to populate it - mysql -u root -p -e 'source /sqldump; source /sqldump' + mysql -u root -p -e 'source /sqldump; use dbd_drupal; source /sqldump;' install-drupal-sites: cd /var/www/html -- 2.25.1