X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit%2Flocal-lib.git;a=blobdiff_plain;f=lib%2Flocal%2Flib.pm;fp=lib%2Flocal%2Flib.pm;h=6685519d0152b944a7ea0991de747ea20e35a605;hp=9fd7017ba51cb235be120a3818b0226aac992902;hb=ecc3a2eebf44c44f730f094f8ac392ded97c49e4;hpb=ea713040a15ab3150bb8f4a4f1239dd85132fde9

diff --git a/lib/local/lib.pm b/lib/local/lib.pm
index 9fd7017..6685519 100644
--- a/lib/local/lib.pm
+++ b/lib/local/lib.pm
@@ -444,7 +444,7 @@ 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};
   }
@@ -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'