From 14bf2ee5cb7b9ae0f9df2385ea479b054fe5ead3 Mon Sep 17 00:00:00 2001 From: David Adam Date: Tue, 5 May 2015 08:37:06 +0800 Subject: bump version for 2.21b --- fish.xcodeproj/project.pbxproj | 6 +++--- osx/config.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fish.xcodeproj/project.pbxproj b/fish.xcodeproj/project.pbxproj index 91045d09..037563bc 100644 --- a/fish.xcodeproj/project.pbxproj +++ b/fish.xcodeproj/project.pbxproj @@ -1327,7 +1327,7 @@ "SYSCONFDIR=L\\\"/usr/local/etc\\\"", "BINDIR=L\\\"/usr/local/bin\\\"", "DOCDIR=L\\\"/usr/local/share/doc\\\"", - "FISH_BUILD_VERSION=\\\"2.1.2\\\"", + "FISH_BUILD_VERSION=\\\"2.2b1\\\"", ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -1455,7 +1455,7 @@ "SYSCONFDIR=L\\\"/usr/local/etc\\\"", "BINDIR=L\\\"/usr/local/bin\\\"", "DOCDIR=L\\\"/usr/local/share/doc\\\"", - "FISH_BUILD_VERSION=\\\"2.1.2\\\"", + "FISH_BUILD_VERSION=\\\"2.2b1\\\"", ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -1483,7 +1483,7 @@ "SYSCONFDIR=L\\\"/usr/local/etc\\\"", "BINDIR=L\\\"/usr/local/bin\\\"", "DOCDIR=L\\\"/usr/local/share/doc\\\"", - "FISH_BUILD_VERSION=\\\"2.1.2\\\"", + "FISH_BUILD_VERSION=\\\"2.2b1\\\"", ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; diff --git a/osx/config.h b/osx/config.h index 36181d7d..a5b0df28 100644 --- a/osx/config.h +++ b/osx/config.h @@ -222,7 +222,7 @@ #define PACKAGE_NAME "fish" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "fish 2.1.2-git" +#define PACKAGE_STRING "fish 2.2b1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "fish" @@ -231,7 +231,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.1.2-git" +#define PACKAGE_VERSION "2.2b1" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 -- cgit v1.2.3 From 49b49d7ed467c4b87fc5dcacc4004a4c6b5de238 Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Fri, 15 May 2015 17:10:29 -0700 Subject: Pass the character index, not the character, to parse_util_expand_variable_error Fixes #2067 --- expand.cpp | 2 +- tests/expansion.err | 3 +++ tests/expansion.in | 4 ++++ tests/expansion.out | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/expand.cpp b/expand.cpp index f927f3c0..1d541a24 100644 --- a/expand.cpp +++ b/expand.cpp @@ -1034,7 +1034,7 @@ static int expand_variables(parser_t &parser, const wcstring &instr, std::vector { if (errors) { - parse_util_expand_variable_error(instr, 0 /* global_token_pos */, c, errors); + parse_util_expand_variable_error(instr, 0 /* global_token_pos */, i, errors); } is_ok = false; diff --git a/tests/expansion.err b/tests/expansion.err index e60c203d..5fcc58e0 100644 --- a/tests/expansion.err +++ b/tests/expansion.err @@ -28,3 +28,6 @@ fish: echo ()[1] Invalid index value fish: echo ()[d] ^ +$) is not a valid variable in fish. +fish: echo $$paren + ^ diff --git a/tests/expansion.in b/tests/expansion.in index b43fd3bf..2b6d9376 100644 --- a/tests/expansion.in +++ b/tests/expansion.in @@ -81,6 +81,10 @@ echo $foo[d] echo ()[1] echo ()[d] +echo "Catch your breath" +set paren ')' +echo $$paren + # Test tilde expansion # On OS X, /tmp is symlinked to /private/tmp # $PWD is our best bet for resolving it diff --git a/tests/expansion.out b/tests/expansion.out index fe594539..9fd68a04 100644 --- a/tests/expansion.out +++ b/tests/expansion.out @@ -40,3 +40,4 @@ 0 1 0 +Catch your breath -- cgit v1.2.3 From a83323705df2dbbe0f7e0379f810d6b805436097 Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Sun, 17 May 2015 19:13:50 -0700 Subject: Make fish_config work correctly when IPv6 is disabled in the kernel Fixes #1754 --- share/tools/web_config/webconfig.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/share/tools/web_config/webconfig.py b/share/tools/web_config/webconfig.py index 8f591d17..5438a43e 100755 --- a/share/tools/web_config/webconfig.py +++ b/share/tools/web_config/webconfig.py @@ -6,6 +6,7 @@ import sys import multiprocessing.pool import os import operator +import socket IS_PY2 = sys.version_info[0] == 2 if IS_PY2: @@ -18,6 +19,14 @@ else: import socketserver as SocketServer from urllib.parse import parse_qs +# Check to see if IPv6 is enabled in the kernel +HAS_IPV6 = True +try: + s = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM) + s.close() +except: + HAS_IPV6 = False + # Disable CLI web browsers term = os.environ.pop('TERM', None) import webbrowser @@ -419,7 +428,7 @@ class FishConfigTCPServer(SocketServer.TCPServer): """TCPServer that only accepts connections from localhost (IPv4/IPv6).""" WHITELIST = set(['::1', '::ffff:127.0.0.1', '127.0.0.1']) - address_family = socket.AF_INET6 + address_family = socket.AF_INET6 if HAS_IPV6 else socket.AF_INET def verify_request(self, request, client_address): return client_address[0] in FishConfigTCPServer.WHITELIST @@ -910,16 +919,18 @@ authkey = binascii.b2a_hex(os.urandom(16)).decode('ascii') # Try to find a suitable port PORT = 8000 +HOST = "::" if HAS_IPV6 else "localhost" while PORT <= 9000: try: Handler = FishConfigHTTPRequestHandler - httpd = FishConfigTCPServer(("::", PORT), Handler) + httpd = FishConfigTCPServer((HOST, PORT), Handler) # Success break except socket.error: err_type, err_value = sys.exc_info()[:2] # str(err_value) handles Python3 correctly if 'Address already in use' not in str(err_value): + print(str(err_value)) break PORT += 1 -- cgit v1.2.3 From 1c99ef5b6eead6cec663b8ca5caab2df2000287c Mon Sep 17 00:00:00 2001 From: David Adam Date: Wed, 20 May 2015 17:04:34 +0800 Subject: FAQ: shorter fish_title fix [skip ci] --- doc_src/faq.hdr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc_src/faq.hdr b/doc_src/faq.hdr index 78b27648..23690d49 100644 --- a/doc_src/faq.hdr +++ b/doc_src/faq.hdr @@ -162,7 +162,7 @@ Quick answer: Run the following command in fish: \fish{cli-dark} -echo 'function fish_title;end' >> ~/.config/fish/config.fish +function fish_title; end; funcsave fish_title \endfish Problem solved! -- cgit v1.2.3