? .drush-cache.info ? includes/table.inc Index: commands/core/core.drush.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/drush/commands/core/core.drush.inc,v retrieving revision 1.160 diff -u -p -r1.160 core.drush.inc --- commands/core/core.drush.inc 31 Dec 2010 00:52:03 -0000 1.160 +++ commands/core/core.drush.inc 31 Dec 2010 02:37:44 -0000 @@ -199,16 +199,21 @@ function core_drush_command() { $items['core-cli'] = array( 'description' => dt('Enter a new shell optimized for drush use.'), 'options' => array( - 'override' => 'List of drush commands or aliases that should override built-in shell functions and commands; otherwise, built-ins override drush commands. Default is help,dd,sa', + 'override' => 'List of drush commands or aliases that should override built-in shell functions and commands; otherwise, built-ins override drush commands. Defaults to help,rsync,dd,sa', + 'contextual' => 'Additional drush overrides that function ONLY when the prompt is "@alias>". Defaults to cron,updatedb,sync,cc', 'pipe' => 'Print the generated .bashrc file and exit.', ), 'examples' => array( 'help' => 'Print available drush commands', 'cd @alias' => 'Navigate to the root of the site indicated by @alias; subsequent commands will target that site.', 'cd %files' => 'Navigate to the files directory.', + 'cd ~' => 'Navigate back to your $HOME directory.', 'lsd files' => 'List all files in the Drupal files directory.', 'on @alias core-status' => 'Run the command "core-status" on the site indicated by @alias', 'use @alias' => 'Run subsequent commands on the site indicated by @alias', + 'use -' => 'Switch back to the last alias "used".', + 'use ~' => 'Use the default alias.', + 'use' => 'Revert to an ordinary prompt; do not use an alias.', 'drush core-cli --pipe > ~/.bash_customizations' => 'Convert your default shell into drush core-cli. Make sure that your .bashrc file includes .bash_customizations (e.g. "source ~/.bash_customizations" or ". ~/.bash_customizations").', ), 'aliases' => array('cli'), @@ -762,17 +767,28 @@ function drush_core_cli() { if (drush_get_context('DRUSH_BACKEND') || drush_get_context('DRUSH_AFFIRMATIVE') || drush_get_context('DRUSH_NEGATIVE')) { return drush_set_error('DRUSH_CLI_INTERACTIVE_ERROR', dt('Cannot run drush core-cli from non-interactive mode; aborting.')); } - + + // We set interactive mode if we are about to run a bash subshell. + // The purpose of doing this is that some options are set differently + // in --pipe mode. To see everything with --pipe, use --pipe --verbose. + $interactive_mode = !drush_get_context('DRUSH_PIPE') || drush_get_context('DRUSH_VERBOSE'); + // Make sure that we call drush the same way that we were called. - $drush_command = DRUSH_COMMAND.' --in-cli'; - - $bashrc_data = implode("/n/n", drush_command_invoke_all('cli_bashrc', $drush_command)); + // In --pipe mode, just use 'drush'. + $drush_command = $interactive_mode ? DRUSH_COMMAND.' --in-cli' : 'drush'; + $bashrc_data = implode("/n/n", drush_command_invoke_all('cli_bashrc', $drush_command, $interactive_mode)); + // Print our bashrc file and exit in --pipe mode if (drush_get_context('DRUSH_PIPE')) { drush_print_pipe($bashrc_data); return TRUE; } + + // If there were any errors, then exit. + if (drush_get_error()) { + return FALSE; + } drush_print("Entering the drush cli. Use CONTROL-D to exit."); drush_print("Type 'help' for help."); @@ -785,7 +801,9 @@ function drush_core_cli() { } // Implement our own hook_cli_bashrc() -function core_cli_bashrc($drush_command) { +function core_cli_bashrc($drush_command, $interactive_mode) { + $bashrc_data = ''; + $initial_site = ''; $site_list = drush_sitealias_resolve_sitespecs(array('@self')); if (!empty($site_list)) { @@ -804,8 +822,13 @@ function core_cli_bashrc($drush_command) $searchpath[] = realpath(dirname(__FILE__) . '/../../'); $bashrc_searchpath = implode(' ', $searchpath); + // Set the prompt to 'drush> ' in interactive mode. + if ($interactive_mode) { + $bashrc_data .= "# Set our prompt to 'drush> '\nPS1='drush> '\n\n"; + } + // Set up our default bashrc file for the drush cli - $bashrc_data = << $command) { // Filter out old commands that still have spaces; // do not mask any existing bash command (e.g. 'grep') // or builtin (e.g. 'eval') with drush aliases. - if ((strpos($key, ' ') === FALSE) && ((in_array($key, $cli_overrides)) || (!drush_shell_exec("which $key")) && (drush_shell_exec("builtin $key") != "1"))) { - $bashrc_data .= "function $key() {\n $drush_command \$DRUPAL_SITE $key \"\$@\"\n}\n"; + if (strpos($key, ' ') === FALSE) { + $conflict = FALSE; + $is_shell_builtin = (drush_shell_exec("builtin $key") == "1"); + if (!in_array($key, $cli_overrides)) { + $status = drush_shell_exec("which $key 2>&1"); + if ($status !== FALSE) { + $output_lines = drush_shell_exec_output(); + $conflict = $output_lines[0]; + } + elseif ($is_shell_builtin) { + $conflict = "builtin $key"; + } + } + elseif ($is_shell_builtin && ($key != "help")) { + drush_set_error('DRUSH_OVERRIDE_BUILTIN', dt("Cannot override shell builtin function !builtin", array('!builtin' => $key))); + } + if (!$conflict) { + $bashrc_data .= "function $key() {\n $drush_command \$DRUPAL_SITE $key \"\$@\"\n}\n"; + } + elseif (in_array($key, $cli_contextual_commands)) { + if ($is_shell_builtin) { + $warning = dt("Warning: overriding shell built-in command !builtin. This could cause unpredictable results with shell scripts.", array('!builtin' => $key)); + drush_log($warning, 'warning'); + $bashrc_data .= "# $warning\n"; + } + $bashrc_data .= "function $key() {\n if [ -z \$DRUPAL_SITE ]\n then \n $conflict\n else\n $drush_command \$DRUPAL_SITE $key \"\$@\"\n fi\n}\n"; + } + else { + $bashrc_data .= "# drush $key skipped; conflicts with $conflict\n"; + } + } + } + + // Add some additional statements to the bashrc data that + // should not go into --pipe mode. + if ($interactive_mode) { + // If there is an initial site, then cd to it. This will set the prompt. + if (!empty($initial_site)) { + $bashrc_data .= "cd $initial_site\n"; + } + // Before entering the new bash script, cd to the current site root, + // if any. This will make our default site for drush match the + // currently bootstrapped site (at least until the user cd's away). + // We do this -after- the drush_print_pipe($bashrc_data) because + // we DO NOT want to change the working directory if this bashrc + // is being used by a login shell. + elseif ($site_root = drush_get_context('DRUSH_DRUPAL_SITE_ROOT')) { + $site_root = drush_get_context('DRUSH_DRUPAL_ROOT') . '/' . $site_root; + $bashrc_data .= "builtin cd $site_root\n"; + } + if ($drush_command != 'drush') { + $bashrc_data .= "alias drush=\"$drush_command\"\n"; } } - // Before entering the new bash script, cd to the current site root, - // if any. This will make our default site for drush match the - // currently bootstrapped site (at least until the user cd's away). - if ($site_root = drush_get_context('DRUSH_DRUPAL_SITE_ROOT')) { - $site_root = drush_get_context('DRUSH_DRUPAL_ROOT') . '/' . $site_root; - $bashrc_data .= "builtin cd $site_root\n"; + // Add some additional statements that should only appear in non-interactive mode. + else { + // If there is an initial site, then use. This will set the prompt. + if (!empty($initial_site)) { + $bashrc_data .= "use $initial_site\n"; + } } return $bashrc_data; Index: includes/drush.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/drush/includes/drush.inc,v retrieving revision 1.180 diff -u -p -r1.180 drush.inc --- includes/drush.inc 31 Dec 2010 01:16:40 -0000 1.180 +++ includes/drush.inc 31 Dec 2010 02:37:45 -0000 @@ -490,6 +490,8 @@ function drush_html_to_text($html, $allo * will be determined automatically, based on a "best fit" algorithm. * @param $output_file * File to write output to. STDOUT used if not specified. + * @return $tbl + * Use $tbl->getTable() to get the output from the return value. */ function drush_print_table($rows, $header = FALSE, $widths = array(), $output_file = NULL) { $tbl = new Console_Table(CONSOLE_TABLE_ALIGN_LEFT , '');