moved optional choices from settings file to interactive prompt

Author: jordanlev

local_mamp.php

@@ -1,17 +1,18 @@
 #!/usr/bin/php
 <?php
 
-#The following files must exist in the same directory as this-here local_mamp.php script:
+# INTERNAL SETTINGS ###########################################################
+define('MYSQL_BIN', '/Applications/MAMP/Library/bin/mysql');
+
+define('STARTING_POINT_NAME_SAMPLE_CONTENT', 'standard');
+define('STARTING_POINT_NAME_EMPTY_CONTENT', 'blank');
+
+//The following files must exist in the same directory as this-here local_mamp.php script:
 define('FILENAME_SETTINGS', 'settings.php'); //required
 define('FILENAME_INSTALL_C5_CLI', 'install-concrete5.php'); //required
 define('FILENAME_ADD_TO_CONFIG', 'append_to_config_site_php.txt'); //optional (use empty string if none)
 define('FILENAME_CLI_LOGIN', 'temp_cli_login.html'); //optional (use empty string if none)
-define('FILENAME_ZENDLOCALEDATA_BLACKLIST', 'remove_zend_locale_data.txt'); //required if REMOVE_NONENGLIGH_ZEND_LOCALE_DATA is TRUE
-
-require(dirname(__FILE__) . '/' . FILENAME_SETTINGS);
-define('STARTING_POINT_NAME_SAMPLE_CONTENT', 'standard');
-define('STARTING_POINT_NAME_EMPTY_CONTENT', 'blank');
-define('MYSQL_BIN', '/Applications/MAMP/Library/bin/mysql');
+define('FILENAME_ZENDLOCALEDATA_BLACKLIST', 'remove_zend_locale_data.txt'); //optional (use empty string if none).
 
 //Available C5 versions for installation (note that 5.5.1 was the first version to allow CLI installation).
 //First one in list becomes default option.
@@ -52,6 +53,15 @@
 );
 
 
+# LOAD USER SETTINGS ##########################################################
+$settings_file_path = dirname(__FILE__) . '/' . FILENAME_SETTINGS;
+if (!is_file($settings_file_path)) {
+	echo "ABORTING INSTALLATION: CANNOT LOCATE SETTINGS FILE ({$settings_file_path})!\n";
+	exit;
+}
+require($settings_file_path);
+
+
 # VALIDATE CONFIG SETTINGS ####################################################
 $c5_cli_script_path = dirname(__FILE__) . '/' . FILENAME_INSTALL_C5_CLI;
 if (!is_file($c5_cli_script_path)) {
@@ -64,6 +74,15 @@
 	exit;
 }
 
+$zend_locale_data_blacklist = '';
+if (FILENAME_ZENDLOCALEDATA_BLACKLIST !== '') {
+	$zend_locale_data_blacklist = dirname(__FILE__) . '/' . FILENAME_ZENDLOCALEDATA_BLACKLIST;
+	if (!is_file($zend_locale_data_blacklist)) {
+		echo "ABORTING INSTALLATION: CANNOT LOCATE ZEND LOCALE DATA BLACKLIST ({$zend_locale_data_blacklist})!\n";
+		exit;
+	}
+}
+
 
 # ASK USER FOR PARAMS #########################################################
 system('clear');
@@ -86,9 +105,9 @@
 # Get target directory
 $htdocs_dir = '/' . trim(HTDOCS_DIR, '/') . '/';
 $htdocs_url = rtrim(BASE_URL, '/') . '/';
-$target = stdin("Enter target directory (trailing slash will be stripped):\n" . $htdocs_dir);
-$target_dir = $htdocs_dir . trim($target, '/');
-$target_url = $htdocs_url . trim($target, '/');
+$response = stdin("Enter target directory (trailing slash will be stripped):\n" . $htdocs_dir);
+$target_dir = $htdocs_dir . trim($response, '/');
+$target_url = $htdocs_url . trim($response, '/');
 if (is_dir($target_dir)) {
 	echo "ABORTING INSTALLATION: TARGET DIRECTORY ({$target_dir}) ALREADY EXISTS!\n";
 	exit;
@@ -104,11 +123,18 @@
 $site = strip_unsafe_cli_chars($site);
 
 # Ask for sample content or blank
-$do_install_sample_content = stdin("Install C5 sample content (Y/n)?\ny/n (default y): ", false);
-if (strtolower($do_install_sample_content) == "n") {
-	$starting_point = STARTING_POINT_NAME_EMPTY_CONTENT;
+$response = stdin("Install C5 sample content (Y/n)?\ny/n (default y): ", false);
+$starting_point = (strtolower($response) == "n") ? STARTING_POINT_NAME_EMPTY_CONTENT : STARTING_POINT_NAME_SAMPLE_CONTENT;
+
+# Ask about optional functionality
+$response = stdin("Remove empty top-level folders (y/N)?\ny/n (default: n): ", false);
+$remove_empty_toplevel_folders = (strtolower($response) == 'y');
+
+if (empty($zend_locale_data_blacklist)) {
+	echo "Zend Locale Data: All files will remain in the installation because no blacklist file was specified.\n\n";
 } else {
-	$starting_point = STARTING_POINT_NAME_SAMPLE_CONTENT;
+	$response = stdin("Remove non-english Zend Locale Data (y/N)?\ny/n (default: n): ", false);
+	$remove_nonengligh_zend_locale_data = (strtolower($response) == 'y');
 }
 
 
@@ -196,11 +222,10 @@
 
 
 # REMOVE NON-ENGLISH ZEND_LOCALE_DATA #########################################
-if (REMOVE_NONENGLIGH_ZEND_LOCALE_DATA) {
+if ($remove_nonengligh_zend_locale_data) {
 	echo "Removing non-english Zend/Locale/Data files...\n";
 
-	$blacklist_file = dirname(__FILE__) . '/' . FILENAME_ZENDLOCALEDATA_BLACKLIST;
-	$blacklist_contents = file_get_contents($blacklist_file);
+	$blacklist_contents = file_get_contents($zend_locale_data_blacklist);
 	$blacklist_contents = str_replace("\r\n", "\n", $blacklist_contents);
 	$blacklist_contents = str_replace("\r", "\n", $blacklist_contents);
 	$remove_filenames = explode("\n", $blacklist_contents);
@@ -216,7 +241,7 @@
 
 
 # REMOVE EMPTY TOP-LEVEL FOLDERS ##############################################
-if (REMOVE_EMPTY_TOPLEVEL_FOLDERS) {
+if ($remove_empty_toplevel_folders) {
 	echo "Removing empty top-level folders...\n";
 	rmdir("{$target_dir}/controllers");
 	rmdir("{$target_dir}/css");

readme.md

@@ -11,7 +11,7 @@ This will save you a lot of time if you build sites for clients or test addons a
 
 ## Installing The Installer
 1. Fork and clone the repo to your local OSX machine, or download the files directly by clicking the "ZIP" button above (then unzip the download).
-2. Edit the `settings.php` file and enter your database and server information (and enable optional settings if desired).
+2. Edit the `settings.php` file and enter your database and server information.
 3. Edit the `append_to_config_site_php.txt` file and modify as needed (the contents of this file will be appended to the `config/site.php` file of installed sites) -- for example, to disable marketplace/newsflow.
 4. Figure out where your command-line php is installed by entering the following command in the Terminal: `which php`. If it says `/usr/bin/php`, they you're good to go. If it says something else, you'll want to change the first line in these 2 files: `install-concrete5.php` and `local_mamp.php` from `#!/usr/bin/php` to `#!/whatever/your/path/is/to/php`.
 5. Make the `local_mamp.php` file executable by navigating to its directory in the Terminal and entering `chmod +x ./local_mamp.php`.

settings.php

@@ -3,16 +3,12 @@
 define('DB_USERNAME', 'root');
 define('DB_PASSWORD', 'root');
 
-define('HTDOCS_DIR', '/Applications/MAMP/htdocs'); //Must be the top-level htdocs directory (not a subdirectory -- that can be entered later during the installation process)
+define('HTDOCS_DIR', '/Applications/MAMP/htdocs/'); //Must be the top-level htdocs directory (not a subdirectory -- that can be entered later during the installation process)
 define('BASE_URL', 'http://localhost:8888'); //Must be the url to the top-level htdocs directory
 
 define('ADMIN_EMAIL', '[email protected]');
 define('ADMIN_PASSWORD', 'admin'); //<--DON'T USE A REAL PASSWORD! (see note below)
 
-define('REMOVE_NONENGLIGH_ZEND_LOCALE_DATA', false); //If set to true, installer removes ~10MB of non-english-language files from /concrete/libraries/3rdparty/Zend/Locale/Data
-define('REMOVE_EMPTY_TOPLEVEL_FOLDERS', false); //If set to true, installer removes most of the empty top-level folders (/controllers, /css, /elements, /helpers, /jobs, /js, /languages, /libraries, /mail, /models, /page_types, /single_pages, /tools, /updates)
-
-
 /**
  * NOTE: For security purposes, the ADMIN_PASSWORD should be something generic (e.g. "admin" or "password")
  * because it gets sent in the url querystring to the temp login page (which will stick around in browser history).