correct output for fish shell

[p5sagit/local-lib.git] / lib / local / lib.pm

diff --git a/lib/local/lib.pm b/lib/local/lib.pm
index 9fd7017..216426b 100644 (file)
--- a/lib/local/lib.pm
+++ b/lib/local/lib.pm
@@ -444,11 +444,11 @@ sub wrap_powershell_output {
 
 sub build_fish_env_declaration {
   my ($class, $name, $args) = @_;
-  my $value = $class->_interpolate($args, '"%s"', '"', '\\%s');
+  my $value = $class->_interpolate($args, '$%s', '"', '\\%s');
   if (!defined $value) {
     return qq{set -e $name;\n};
   }
-  $value =~ s/$_path_sep/ /;
+  $value =~ s/$_path_sep/ /g;
   qq{set -x $name $value;\n};
 }
 
@@ -567,6 +567,7 @@ sub guess_shelltype {
   for ($shellbin) {
     return
         /csh$/                   ? 'csh'
+      : /fish/                   ? 'fish'
       : /command(?:\.com)?$/i    ? 'cmd'
       : /cmd(?:\.exe)?$/i        ? 'cmd'
       : /4nt(?:\.exe)?$/i        ? 'cmd'