From 40de253b3a01757c794f0f1b36df17d006cb3e52 Mon Sep 17 00:00:00 2001 From: David Adam Date: Fri, 17 Feb 2017 21:30:43 +0800 Subject: [PATCH] Upgrade git:// and http:// URLs to https:// Work on fish-shell/fish-site#47 [ci skip] --- README.md | 8 ++++---- debian/control | 4 ++-- doc_src/index.hdr.in | 2 +- doc_src/user_doc.header.html | 2 +- fish.pc.in | 2 +- fish.spec.in | 2 +- share/functions/help.fish | 2 +- src/history.cpp | 2 +- src/wgetopt.cpp | 2 +- src/wgetopt.h | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 90a8cad65..527b83333 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,15 @@ -[fish](http://fishshell.com/) - the friendly interactive shell [![Build Status](https://travis-ci.org/fish-shell/fish-shell.svg?branch=master)](https://travis-ci.org/fish-shell/fish-shell) +[fish](https://fishshell.com/) - the friendly interactive shell [![Build Status](https://travis-ci.org/fish-shell/fish-shell.svg?branch=master)](https://travis-ci.org/fish-shell/fish-shell) ================================================ fish is a smart and user-friendly command line shell for OS X, Linux, and the rest of the family. fish includes features like syntax highlighting, autosuggest-as-you-type, and fancy tab completions that just work, with no configuration required. -For more on fish's design philosophy, see the [design document](http://fishshell.com/docs/current/design.html). +For more on fish's design philosophy, see the [design document](https://fishshell.com/docs/current/design.html). ## Quick Start -fish generally works like other shells, like bash or zsh. A few important differences can be found at by searching for the magic phrase "unlike other shells". +fish generally works like other shells, like bash or zsh. A few important differences can be found at by searching for the magic phrase "unlike other shells". -Detailed user documentation is available by running `help` within fish, and also at +Detailed user documentation is available by running `help` within fish, and also at ## Building diff --git a/debian/control b/debian/control index 5ff06de53..d9985ff36 100644 --- a/debian/control +++ b/debian/control @@ -6,8 +6,8 @@ Uploaders: David Adam Build-Depends: debhelper (>= 9.0.0), libncurses5-dev, autoconf, autotools-dev, dh-autoreconf, gettext # When libpcre2-dev is available on all supported Debian versions, add a dependency on that. Standards-Version: 3.9.4 -Homepage: http://fishshell.com/ -Vcs-Git: git://github.com/fish-shell/fish-shell.git +Homepage: https://fishshell.com/ +Vcs-Git: https://github.com/fish-shell/fish-shell.git Vcs-Browser: https://github.com/fish-shell/fish-shell Package: fish diff --git a/doc_src/index.hdr.in b/doc_src/index.hdr.in index 3b537179c..a85bb32bc 100644 --- a/doc_src/index.hdr.in +++ b/doc_src/index.hdr.in @@ -17,7 +17,7 @@ \section introduction Introduction -This is the documentation for `fish`, the friendly interactive shell. `fish` is a user friendly commandline shell intended mostly for interactive use. A shell is a program used to execute other programs. For the latest information on `fish`, please visit the `fish` homepage. +This is the documentation for `fish`, the friendly interactive shell. `fish` is a user friendly commandline shell intended mostly for interactive use. A shell is a program used to execute other programs. For the latest information on `fish`, please visit the `fish` homepage. \section syntax Syntax overview diff --git a/doc_src/user_doc.header.html b/doc_src/user_doc.header.html index 8e1be50c6..59f0b4b3d 100644 --- a/doc_src/user_doc.header.html +++ b/doc_src/user_doc.header.html @@ -9,7 +9,7 @@ $extrastylesheet
-fish shell +fish shell | Documentation | diff --git a/fish.pc.in b/fish.pc.in index 04fd75ce8..7a96e72c6 100644 --- a/fish.pc.in +++ b/fish.pc.in @@ -6,5 +6,5 @@ confdir=@extra_confdir@ Name: fish Description: fish, the friendly interactive shell -URL: http://fishshell.com/ +URL: https://fishshell.com/ Version: @fish_build_version@ diff --git a/fish.spec.in b/fish.spec.in index b4e1e69f9..30986b799 100644 --- a/fish.spec.in +++ b/fish.spec.in @@ -6,7 +6,7 @@ Release: 0.%{?dist} License: GPL-2.0 Group: System/Shells -URL: http://fishshell.com/ +URL: https://fishshell.com/ Source0: %{name}_@VERSION@.orig.tar.gz BuildRequires: ncurses-devel gettext gcc-c++ autoconf diff --git a/share/functions/help.fish b/share/functions/help.fish index 341f79aad..0473ef8b9 100644 --- a/share/functions/help.fish +++ b/share/functions/help.fish @@ -125,7 +125,7 @@ function help --description 'Show help for the fish shell' else # Go to the web. Only include one dot in the version string set -l version_string (echo $FISH_VERSION| cut -d . -f 1,2) - set page_url http://fishshell.com/docs/$version_string/$fish_help_page + set page_url https://fishshell.com/docs/$version_string/$fish_help_page end # OS X /usr/bin/open swallows fragments (anchors), so use osascript diff --git a/src/history.cpp b/src/history.cpp index 595304f62..b95a7c3f2 100644 --- a/src/history.cpp +++ b/src/history.cpp @@ -854,7 +854,7 @@ void history_t::get_string_representation(wcstring *result, const wcstring &sepa // Append new items. Note that in principle we could use const_reverse_iterator, but we do not // because reverse_iterator is not convertible to const_reverse_iterator. See - // http://github.com/fish-shell/fish-shell/issues/431. + // https://github.com/fish-shell/fish-shell/issues/431. for (history_item_list_t::reverse_iterator iter = new_items.rbegin(); iter < new_items.rend(); ++iter) { // Skip a pending item if we have one. diff --git a/src/wgetopt.cpp b/src/wgetopt.cpp index dbb0d4393..414701387 100644 --- a/src/wgetopt.cpp +++ b/src/wgetopt.cpp @@ -5,7 +5,7 @@ // all internal commands use wide characters and hence this library is useful. // // If you want to use this version of getopt in your program, download the fish sourcecode, -// available at the fish homepage. Extract the sourcode, copy +// available at the fish homepage. Extract the sourcode, copy // wgetopt.c and wgetopt.h into your program directory, include wgetopt.h in your program, and use // all the regular getopt functions, prefixing every function, global variable and structure with a // 'w', and use only wide character strings. There are no other functional changes in this version diff --git a/src/wgetopt.h b/src/wgetopt.h index 6bc0df5f3..3020d245a 100644 --- a/src/wgetopt.h +++ b/src/wgetopt.h @@ -5,7 +5,7 @@ // all internal commands use wide characters and hence this library is useful. // // If you want to use this version of getopt in your program, -// 1. Download the fish sourcecode, available at http://fishshell.com +// 1. Download the fish sourcecode, available at https://fishshell.com // 2. Extract the sourcode // 3. Copy wgetopt.cpp and wgetopt.h into your program directory, // 4. #include wgetopt.h in your program