Authenticate connections to web_config service

- Require all requests to use a session path.
 - Use a redirect file to avoid exposing the URL on the command line, as
   it contains the session path.

Fix for CVE-2014-2914.
Closes #1438.

.builds/alpine.yml

@@ -1,26 +0,0 @@
-image: alpine/edge
-packages:
-  - cargo
-  - cmake
-  - ninja
-  - pcre2-dev
-  - py3-pexpect
-  - python3
-  - rust
-  - tmux
-sources:
-  - https://github.com/fish-shell/fish-shell
-tasks:
-  - build: |
-          cd fish-shell
-          mkdir build
-          cd build
-          cmake -G Ninja .. \
-            -DCMAKE_INSTALL_PREFIX=/usr \
-            -DCMAKE_INSTALL_DATADIR=share \
-            -DCMAKE_INSTALL_DOCDIR=share/doc/fish \
-            -DCMAKE_INSTALL_SYSCONFDIR=/etc
-          ninja
-  - test: |
-          cd fish-shell/build
-          ninja fish_run_tests

.builds/arch.yml

@@ -1,23 +0,0 @@
-image: archlinux
-packages:
-  - cmake
-  - ninja
-  - python
-  - python-pexpect
-  - tmux
-sources:
-  - https://git.sr.ht/~faho/fish
-tasks:
-  - build: |
-          cd fish
-          mkdir build || :
-          cd build
-          cmake -G Ninja .. \
-          -DCMAKE_INSTALL_PREFIX=/usr \
-          -DCMAKE_INSTALL_DATADIR=share \
-          -DCMAKE_INSTALL_DOCDIR=share/doc/fish \
-          -DCMAKE_INSTALL_SYSCONFDIR=/etc
-          ninja
-  - test: |
-          cd fish/build
-          ninja fish_run_tests

.builds/freebsd.yml

@@ -1,30 +0,0 @@
-image: freebsd/latest
-packages:
-  - cmake
-  - gcc
-  - gettext
-  - gmake
-  - llvm
-  - ninja
-  - pcre2
-  - py311-pexpect
-  - py311-sphinx
-  - python
-  - rust
-  - tmux
-sources:
-  - https://github.com/fish-shell/fish-shell
-tasks:
-  - build: |
-          cd fish-shell
-          mkdir build
-          cd build
-          cmake -GNinja .. \
-            -DCMAKE_INSTALL_PREFIX=/usr \
-            -DCMAKE_INSTALL_DATADIR=share \
-            -DCMAKE_INSTALL_DOCDIR=share/doc/fish \
-            -DCMAKE_INSTALL_SYSCONFDIR=/etc
-          ninja
-  - test: |
-          cd fish-shell/build
-          ninja fish_run_tests

.builds/openbsd.yml

@@ -1,30 +0,0 @@
-image: openbsd/latest
-packages:
-  - cmake
-  - gcc
-  - gettext
-  - gmake
-  - llvm
-  - ninja
-  - pcre2
-  - py3-pexpect
-  - py3-sphinx
-  - python
-  - rust
-  - tmux
-sources:
-  - https://github.com/fish-shell/fish-shell
-tasks:
-  - build: |
-          cd fish-shell
-          mkdir build
-          cd build
-          cmake -GNinja .. \
-            -DCMAKE_INSTALL_PREFIX=/usr \
-            -DCMAKE_INSTALL_DATADIR=share \
-            -DCMAKE_INSTALL_DOCDIR=share/doc/fish \
-            -DCMAKE_INSTALL_SYSCONFDIR=/etc
-          ninja
-  - test: |
-          cd fish-shell/build
-          ninja fish_run_tests

.cargo/config.toml

@@ -1,8 +0,0 @@
-# This file is _not_ included in the tarballs for now
-# Binary builds on Linux packaging infrastructure need to overwrite it to make `cargo vendor` work
-# Releases and development builds made using OBS/Launchpad will _not_ reflect the contents of this
-# file
-
-[resolver]
-# Make cargo 1.84+ respect MSRV (rust-version in Cargo.toml)
-incompatible-rust-versions = "fallback"

.cirrus.yml

@@ -1,49 +0,0 @@
-env:
-    CIRRUS_CLONE_DEPTH: 100
-    CI: 1
-
-linux_task:
-    matrix:
-        - name: alpine
-          container: &step
-              image: ghcr.io/krobelus/fish-ci/alpine:latest
-              memory: 4GB
-        - name: ubuntu-oldest-supported
-          container:
-              <<: *step
-              image: ghcr.io/krobelus/fish-ci/ubuntu-oldest-supported:latest
-    tests_script:
-        # cirrus at times gives us 32 procs and 2 GB of RAM
-        # Unrestriced parallelism results in OOM
-        - lscpu || true
-        - (cat /proc/meminfo | grep MemTotal) || true
-        - mkdir build && cd build
-        - FISH_TEST_MAX_CONCURRENCY=6 cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug ..
-        - ninja -j 6 fish
-        - ninja fish_run_tests
-    only_if: $CIRRUS_REPO_OWNER == 'fish-shell'
-
-freebsd_task:
-    matrix:
-        - name: FreeBSD Stable
-          freebsd_instance:
-              image: freebsd-15-0-release-amd64-ufs # updatecli.d/cirrus-freebsd.yml
-    tests_script:
-        - pkg update
-        - pkg install -y cmake-core devel/pcre2 devel/ninja gettext git-lite lang/rust misc/py-pexpect
-        # libclang.so is a required build dependency for rust-c++ ffi bridge
-        - pkg install -y llvm
-        # BSDs have the following behavior: root may open or access files even if
-        # the mode bits would otherwise disallow it. For example root may open()
-        # a file with write privileges even if the file has mode 400. This breaks
-        # our tests for e.g. cd and path. So create a new unprivileged user to run tests.
-        - pw user add -n fish-user -s /bin/csh -d /home/fish-user
-        - mkdir -p /home/fish-user
-        - chown -R fish-user /home/fish-user
-        - mkdir build && cd build
-        - chown -R fish-user ..
-        - sudo -u fish-user -s whoami
-        - sudo -u fish-user -s FISH_TEST_MAX_CONCURRENCY=1 cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug ..
-        - sudo -u fish-user -s ninja -j 6 fish
-        - sudo -u fish-user -s ninja fish_run_tests
-    only_if: $CIRRUS_REPO_OWNER == 'fish-shell'

.clang-format

@@ -1,8 +0,0 @@
-# Use the Google style with these modifications:
-#
-# 1) lines can be up to 100 chars long rather than 80, and
-# 2) use a four space indent rather than two spaces.
-#
-BasedOnStyle: Google
-ColumnLimit: 100
-IndentWidth: 4

.editorconfig

@@ -1,31 +0,0 @@
-root = true
-
-[*]
-indent_size = 4
-indent_style = space
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-max_line_length = 100
-
-[{Makefile,*.in}]
-indent_style = tab
-
-[*.{md,rst}]
-max_line_length = unset
-
-[*.sh]
-indent_size = 4
-
-[build_tools/release.sh]
-max_line_length = 72
-
-[Dockerfile]
-indent_size = 2
-
-[share/{completions,functions}/**.fish]
-max_line_length = unset
-
-[{COMMIT_EDITMSG,git-revise-todo,*.jjdescription}]
-max_line_length = 72

.gitattributes

@@ -1,30 +1,4 @@
-# normalize newlines
-* text=auto eol=lf
-
-# let git show off diff hunk headers, help git diff -L:
-# https://git-scm.com/docs/gitattributes
-*.c diff=cpp
-*.h diff=cpp
-*.py diff=py
-*.rs diff=rust
-# add a [diff "fish"] to git config with pattern
-*.fish diff=fish
-
-# omit from git archive
 .gitattributes export-ignore
 .gitignore export-ignore
-/build_tools/make_tarball.sh export-ignore
-/.github export-ignore
-/.github/* export-ignore
-/.builds export-ignore
-/.builds/* export-ignore
-# to make cargo vendor work correctly
-/.cargo/ export-ignore
-/.cargo/config.toml export-ignore
+/build_tools export-ignore
 
-# for linguist, which drives GitHub's language statistics
-alpine.js linguist-vendored
-doc_src/** linguist-documentation
-*.fish linguist-language=fish
-# see 70f2899fcd which attempts to "rig the count"
-share/completions/*.fish linguist-documentation

.github/FUNDING.yml

@@ -1,2 +0,0 @@
-github:
-  - krobelus

.github/ISSUE_TEMPLATE/bug.md

@@ -1,24 +0,0 @@
----
-name: "Bug Report"
-about: "Simple template for bug reports"
-title: ""
-labels: []
-assignees: []
----
-
-<!--
-Please tell us which fish version you are using by executing the following:
-
-  fish --version
-  echo $version
-
-Please tell us which operating system (output of `uname`) and terminal you are using.
-
-Please tell us if you tried fish without third-party customizations by executing this command and whether it affected the behavior you are reporting:
-
-  sh -c 'env HOME=$(mktemp -d) XDG_CONFIG_HOME= XDG_DATA_DIRS= fish'
-
-Tell us how to reproduce the problem. Including an asciinema.org recording is useful for problems that involve the visual display of fish output such as its prompt.
--->
-
-**YOUR TEXT HERE**

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,8 +0,0 @@
-
-
-## TODOs:
-<!-- Check off what what has been done so far. -->
-- [ ] If addressing an issue, a commit message mentions `Fixes issue #<issue-number>`
-- [ ] Changes to fish usage are reflected in user documentation/manpages.
-- [ ] Tests have been added for regressions fixed
-- [ ] User-visible changes noted in CHANGELOG.rst <!-- Usually skipped for changes to completions -->

.github/actions/install-dependencies/action.yml

@@ -1,41 +0,0 @@
-name: Install dependencies for system tests
-
-inputs:
-  include_sphinx:
-    description: Whether to install Sphinx
-    required: true
-    default: false
-  include_pcre:
-    description: Whether to install the PCRE library
-    required: false
-    default: true
-
-permissions:
-  contents: read
-
-runs:
-  using: "composite"
-  steps:
-    - shell: bash
-      env:
-        include_pcre: ${{ inputs.include_pcre }}
-      run: |
-        set -x
-        : "optional dependencies"
-        sudo apt install \
-          gettext \
-          $(if $include_pcre; then echo libpcre2-dev; fi) \
-        ;
-        : "system test dependencies"
-        sudo apt install \
-          diffutils $(: "for diff") \
-          git \
-          gettext \
-          less \
-          $(if ${{ inputs.include_pcre }}; then echo libpcre2-dev; fi) \
-          python3-pexpect \
-          tmux \
-          wget \
-        ;
-    - uses: ./.github/actions/install-sphinx
-      if: ${{ inputs.include_sphinx == 'true' }}

.github/actions/install-sphinx/action.yml

@@ -1,23 +0,0 @@
-name: Install sphinx
-
-permissions:
-  contents: read
-
-runs:
-  using: "composite"
-  steps:
-    - shell: bash
-      run: |
-        set -x
-        sudo pip install uv --break-system-packages
-        command -v uv
-        command -v uvx
-        # Check that pyproject.toml and the lock file are in sync.
-        # TODO Use "uv" to install Python as well.
-        : 'Note that --no-managed-python below would be implied but be explicit'
-        uv='env UV_PYTHON=python uv --no-managed-python'
-        $uv lock --check --exclude-newer="$(awk -F'"' <uv.lock '/^exclude-newer[[:space:]]*=/ {print $2}')"
-        # Install globally.
-        sudo $uv pip install --group=dev --system --break-system-packages
-        # Smoke test.
-        python -c 'import sphinx; import sphinx_markdown_builder'

.github/actions/rust-toolchain/action.yml

@@ -1,41 +0,0 @@
-name: Rust Toolchain
-
-inputs:
-  toolchain_channel:
-    description: Either "stable" or "msrv"
-    required: true
-  targets:
-    description: Comma-separated list of target triples to install for this toolchain
-    required: false
-  components:
-    description: Comma-separated list of components to be additionally installed
-    required: false
-
-permissions:
-  contents: read
-
-runs:
-  using: "composite"
-  steps:
-    - name: Set toolchain
-      env:
-        toolchain_channel: ${{ inputs.toolchain_channel }}
-      shell: bash
-      run: |
-        set -x
-        toolchain=$(
-          case "$toolchain_channel" in
-            (stable) echo 1.92 ;; # updatecli.d/rust.yml
-            (msrv)   echo 1.85 ;; # updatecli.d/rust.yml
-            (*)
-              printf >&2 "error: unsupported toolchain channel %s" "$toolchain_channel"
-              exit 1
-              ;;
-          esac
-        )
-        printf 'TOOLCHAIN=%s\n' "$toolchain" >>"$GITHUB_ENV"
-    - uses: dtolnay/rust-toolchain@master
-      with:
-        toolchain: ${{ env.TOOLCHAIN }}
-        targets: ${{ inputs.targets }}
-        components: ${{ inputs.components }}

.github/actions/rust-toolchain@oldest-supported/action.yml

@@ -1,21 +0,0 @@
-name: Oldest Supported Rust Toolchain
-
-inputs:
-  targets:
-    description: Comma-separated list of target triples to install for this toolchain
-    required: false
-  components:
-    description: Comma-separated list of components to be additionally installed
-    required: false
-
-permissions:
-  contents: read
-
-runs:
-  using: "composite"
-  steps:
-    - uses: ./.github/actions/rust-toolchain
-      with:
-        toolchain_channel: "msrv"
-        targets: ${{ inputs.targets }}
-        components: ${{ inputs.components }}

.github/actions/rust-toolchain@stable/action.yml

@@ -1,21 +0,0 @@
-name: Stable Rust Toolchain
-
-inputs:
-  targets:
-    description: Comma-separated list of target triples to install for this toolchain
-    required: false
-  components:
-    description: Comma-separated list of components to be additionally installed
-    required: false
-
-permissions:
-  contents: read
-
-runs:
-  using: "composite"
-  steps:
-    - uses: ./.github/actions/rust-toolchain
-      with:
-        toolchain_channel: "stable"
-        targets: ${{ inputs.targets }}
-        components: ${{ inputs.components }}

.github/workflows/autolabel_prs.yml

@@ -1,40 +0,0 @@
-name: Auto-Label PRs
-
-on:
-  pull_request_target:
-    types: [opened, synchronize]
-
-jobs:
-  label-and-milestone:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Set label and milestone
-      id: set-label-milestone
-      uses: actions/github-script@v7
-      with:
-        script: |
-          const completionsLabel = 'completions';
-
-          // Get changed files in the pull request
-          const prNumber = context.payload.pull_request.number;
-          const { data: files } = await github.rest.pulls.listFiles({
-            owner: context.repo.owner,
-            repo: context.repo.repo,
-            pull_number: prNumber,
-          });
-
-          // Check if any file matches /share/completions/*.fish and no change is outside of /share/
-          const completionsRegex = new RegExp('^share/completions/.*\.fish');
-          const isCompletions = files.some(file => completionsRegex.test(file.filename))
-            && files.every(file => file.filename.startsWith('share/'));
-
-          if (isCompletions) {
-            // Add label to PR
-            await github.rest.issues.addLabels({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: prNumber,
-              labels: [completionsLabel],
-            });
-            console.log(`PR ${prNumber} assigned label "${completionsLabel}"`);
-          }

.github/workflows/build_docker_images.yml

@@ -1,64 +0,0 @@
-name: Build Docker test images
-
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - 'docker/**'
-  workflow_dispatch:
-
-concurrency:
-  group: docker-builds
-
-env:
-  REGISTRY: ghcr.io
-  NAMESPACE: fish-ci
-
-jobs:
-  docker-build:
-    if: github.repository_owner == 'fish-shell'
-    permissions:
-      contents: read
-      packages: write
-      attestations: write
-      id-token: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-latest
-            target: alpine
-          - os: ubuntu-latest
-            target: ubuntu-oldest-supported
-    runs-on: ${{ matrix.os }}
-
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v5
-      -
-        name: Login to Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
-        with:
-          images: ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.NAMESPACE }}/${{ matrix.target }}
-          flavor: |
-            latest=true
-      -
-        name: Build and push
-        uses: docker/build-push-action@v6
-        with:
-          context: docker/context
-          push: true
-          file: docker/${{ matrix.target }}.Dockerfile
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/lint-dependencies.yml

@@ -1,24 +0,0 @@
-name: Lint Dependencies
-on:
-  push:
-    paths:
-      - '.github/workflows/lint-dependencies.yml'
-      - 'Cargo.lock'
-      - '**/Cargo.toml'
-      - 'deny.toml'
-  pull_request:
-    paths:
-      - '.github/workflows/lint-dependencies.yml'
-      - 'Cargo.lock'
-      - '**/Cargo.toml'
-      - 'deny.toml'
-jobs:
-  cargo-deny:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: EmbarkStudios/cargo-deny-action@v2
-      with:
-        command: check licenses
-        arguments: --all-features --locked --exclude-dev
-        rust-version: 1.92 # updatecli.d/rust.yml

.github/workflows/lint.yml

@@ -1,62 +0,0 @@
-name: Lint
-
-on: [push, pull_request]
-
-permissions:
-  contents: read
-
-jobs:
-  format:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - uses: ./.github/actions/rust-toolchain@stable
-      with:
-        components: rustfmt
-    - name: install dependencies
-      run: pip install ruff
-    - name: build fish
-      run: cargo build
-    - name: check format
-      run: PATH="target/debug:$PATH" build_tools/style.fish --all --check
-    - name: check rustfmt
-      run: find build.rs crates src -type f -name '*.rs' | xargs rustfmt --check
-
-
-  clippy:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        include:
-          - rust_version: "stable"
-            features: ""
-          - rust_version: "stable"
-            features: "--no-default-features"
-          - rust_version: "msrv"
-            features: ""
-    steps:
-    - uses: actions/checkout@v3
-    - uses: ./.github/actions/rust-toolchain
-      with:
-        toolchain_channel: ${{ matrix.rust_version }}
-        components: clippy
-    - name: Install deps
-      run: |
-        sudo apt install gettext
-    - name: cargo clippy
-      run: cargo clippy --workspace --all-targets ${{ matrix.features }} -- --deny=warnings
-
-  rustdoc:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - uses: ./.github/actions/rust-toolchain@stable
-    - name: Install deps
-      run: |
-        sudo apt install gettext
-    - name: cargo doc
-      run: |
-        RUSTDOCFLAGS='-D warnings' cargo doc --workspace
-    - name: cargo doctest
-      run: |
-        cargo test --doc --workspace

.github/workflows/lockthreads.yml

@@ -1,26 +0,0 @@
-name: 'Lock threads'
-
-on:
-  schedule:
-    - cron: '0 18 * * 1'
-#            │ │  │ │ │
-#   min 0-59 ┘ │  │ │ └ weekday 0-6
-#    hour 0-23 ┘  │ └ month 1-12
-#                 └ day 1-31
-permissions:
-  contents: read
-
-jobs:
-  lock:
-    if: github.repository_owner == 'fish-shell'
-    permissions:
-      issues: write  # for dessant/lock-threads to lock issues
-      pull-requests: write  # for dessant/lock-threads to lock PRs
-    runs-on: ubuntu-latest
-    steps:
-      - uses: dessant/lock-threads@v4
-        with:
-          github-token: ${{ github.token }}
-          issue-inactive-days: '365'
-          pr-inactive-days: '365'
-          exclude-any-issue-labels: 'question, needs more info'

.github/workflows/release.yml

@@ -1,192 +0,0 @@
-name: Create a new release
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Version to release (tag name)'
-        required: true
-        type: string
-
-permissions:
-  contents: write
-
-jobs:
-  is-release-tag:
-    name: Pre-release checks
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          # Workaround for https://github.com/actions/checkout/issues/882
-          ref: ${{ inputs.version }}
-      - name: Check if the pushed tag looks like a release
-        run: |
-          set -x
-          commit_subject=$(git log -1 --format=%s)
-          tag=$(git describe)
-          [ "$commit_subject" = "Release $tag" ]
-
-
-  source-tarball:
-    needs: [is-release-tag]
-    name: Create the source tarball
-    runs-on: ubuntu-latest
-    outputs:
-      version: ${{ steps.version.outputs.version }}
-      tarball-name: ${{ steps.version.outputs.tarball-name }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          # Workaround for https://github.com/actions/checkout/issues/882
-          ref: ${{ inputs.version }}
-      - name: Install dependencies
-        run: sudo apt install cmake gettext ninja-build python3-pip
-      - uses: ./.github/actions/install-sphinx
-      - name: Create tarball
-        run: |
-          set -x
-          mkdir /tmp/fish-built
-          FISH_ARTEFACT_PATH=/tmp/fish-built ./build_tools/make_tarball.sh
-          relnotes=/tmp/fish-built/release-notes.md
-          # Need history since the last release (i.e. tag) for stats.
-          git fetch --tags
-          git fetch --unshallow
-          gpg_public_key_url=https://github.com/${{ github.actor }}.gpg
-          curl -sS "$gpg_public_key_url" | grep 'PGP PUBLIC KEY BLOCK' -A5
-          FISH_GPG_PUBLIC_KEY_URL=$gpg_public_key_url \
-            sh -x ./build_tools/release-notes.sh >"$relnotes"
-          # Delete title
-          sed -n 1p "$relnotes" | grep -q "^## fish .*"
-          sed -n 2p "$relnotes" | grep -q '^$'
-          sed -i 1,2d "$relnotes"
-      - name: Upload tarball artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: source-tarball
-          path: |
-            /tmp/fish-built/fish-${{ inputs.version }}.tar.xz
-            /tmp/fish-built/release-notes.md
-          if-no-files-found: error
-
-  packages-for-linux:
-    needs: [is-release-tag]
-    name: Build single-file fish for Linux
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          # Workaround for https://github.com/actions/checkout/issues/882
-          ref: ${{ inputs.version }}
-      - name: Install Rust Stable
-        uses: ./.github/actions/rust-toolchain@stable
-        with:
-          targets: x86_64-unknown-linux-musl,aarch64-unknown-linux-musl
-      - name: Install dependencies
-        run: sudo apt install crossbuild-essential-arm64 gettext musl-tools
-      - uses: ./.github/actions/install-sphinx
-      - name: Build statically-linked executables
-        run: |
-          set -x
-          cargo build --release --target x86_64-unknown-linux-musl --bin fish
-          CFLAGS="-D_FORTIFY_SOURCE=2" \
-            CC=aarch64-linux-gnu-gcc \
-            RUSTFLAGS="-C linker=aarch64-linux-gnu-gcc -C link-arg=-lgcc -C link-arg=-D_FORTIFY_SOURCE=0" \
-            cargo build --release --target aarch64-unknown-linux-musl --bin fish
-      - name: Compress
-        run: |
-          set -x
-          for arch in x86_64 aarch64; do
-            tar -cazf fish-$(git describe)-linux-$arch.tar.xz \
-              -C target/$arch-unknown-linux-musl/release fish
-          done
-      - uses: actions/upload-artifact@v4
-        with:
-          name: Static builds for Linux
-          path: fish-${{ inputs.version }}-linux-*.tar.xz
-          if-no-files-found: error
-
-  create-draft-release:
-    needs:
-      - is-release-tag
-      - source-tarball
-      - packages-for-linux
-    name: Create release draft
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          # Workaround for https://github.com/actions/checkout/issues/882
-          ref: ${{ inputs.version }}
-      - name: Download all artifacts
-        uses: actions/download-artifact@v4
-        with:
-          merge-multiple: true
-          path: /tmp/artifacts
-      - name: List artifacts
-        run: find /tmp/artifacts -type f
-      - name: Create draft release
-        uses: softprops/action-gh-release@v2
-        with:
-          tag_name: ${{ inputs.version }}
-          name: fish ${{ inputs.version }}
-          body_path: /tmp/artifacts/release-notes.md
-          draft: true
-          files: |
-            /tmp/artifacts/fish-${{ inputs.version }}.tar.xz
-            /tmp/artifacts/fish-${{ inputs.version }}-linux-*.tar.xz
-
-  packages-for-macos:
-    needs: [is-release-tag, create-draft-release]
-    name: Build packages for macOS
-    runs-on: macos-latest
-    environment: macos-codesign
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          # Workaround for https://github.com/actions/checkout/issues/882
-          ref: ${{ inputs.version }}
-      - name: Install Rust
-        uses: ./.github/actions/rust-toolchain@stable
-        with:
-          targets: aarch64-apple-darwin,x86_64-apple-darwin
-      - name: Install dependencies
-        run: brew install gettext
-      - uses: ./.github/actions/install-sphinx
-      - name: Build and codesign
-        run: |
-          die() { echo >&2 "$*"; exit 1; }
-          [ -n "$MAC_CODESIGN_APP_P12_BASE64" ] || die "Missing MAC_CODESIGN_APP_P12_BASE64"
-          [ -n "$MAC_CODESIGN_INSTALLER_P12_BASE64" ] || die "Missing MAC_CODESIGN_INSTALLER_P12_BASE64"
-          [ -n "$MAC_CODESIGN_PASSWORD" ] || die "Missing MAC_CODESIGN_PASSWORD"
-          [ -n "$MACOS_NOTARIZE_JSON" ] || die "Missing MACOS_NOTARIZE_JSON"
-          set -x
-          export FISH_ARTEFACT_PATH=/tmp/fish-built
-          # macOS runners keep having issues loading Cargo.toml dependencies from git (GitHub) instead
-          # of crates.io, so give this a try. It's also sometimes significantly faster on all platforms.
-          export CARGO_NET_GIT_FETCH_WITH_CLI=true
-          cargo install apple-codesign
-          mkdir -p "$FISH_ARTEFACT_PATH"
-          echo "$MAC_CODESIGN_APP_P12_BASE64" | base64 --decode >/tmp/app.p12
-          echo "$MAC_CODESIGN_INSTALLER_P12_BASE64" | base64 --decode >/tmp/installer.p12
-          echo "$MACOS_NOTARIZE_JSON" >/tmp/notarize.json
-          ./build_tools/make_macos_pkg.sh -s -f /tmp/app.p12 \
-            -i /tmp/installer.p12 -p "$MAC_CODESIGN_PASSWORD" \
-            -n -j /tmp/notarize.json -- -c "-DWITH_DOCS=ON"
-          version=$(git describe)
-          [ -f "${FISH_ARTEFACT_PATH}/fish-$version.app.zip" ]
-          [ -f "${FISH_ARTEFACT_PATH}/fish-$version.pkg" ]
-          rm /tmp/installer.p12 /tmp/app.p12 /tmp/notarize.json
-        env:
-          MAC_CODESIGN_APP_P12_BASE64: ${{ secrets.MAC_CODESIGN_APP_P12_BASE64 }}
-          MAC_CODESIGN_INSTALLER_P12_BASE64: ${{ secrets.MAC_CODESIGN_INSTALLER_P12_BASE64 }}
-          MAC_CODESIGN_PASSWORD: ${{ secrets.MAC_CODESIGN_PASSWORD }}
-          MACOS_NOTARIZE_JSON: ${{ secrets.MACOS_NOTARIZE_JSON }}
-      - name: Add macOS packages to the release
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          version=$(git describe)
-          gh release upload $version \
-            /tmp/fish-built/fish-$version.app.zip \
-            /tmp/fish-built/fish-$version.pkg

.github/workflows/test.yml

@@ -1,176 +0,0 @@
-name: Test
-
-on: [push, pull_request]
-
-env:
-  FISH_TEST_MAX_CONCURRENCY: "4"
-  CMAKE_BUILD_PARALLEL_LEVEL: "4"
-
-permissions:
-  contents: read
-
-jobs:
-  ubuntu:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: ./.github/actions/rust-toolchain@oldest-supported
-    - name: Install deps
-      uses: ./.github/actions/install-dependencies
-      with:
-        include_sphinx: true
-    - name: Generate a locale that uses a comma as decimal separator.
-      run: |
-        sudo locale-gen fr_FR.UTF-8
-    - name: cmake
-      run: |
-        mkdir build && cd build
-        cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo
-    - name: make
-      run: |
-        make -C build VERBOSE=1
-    - name: make fish_run_tests
-      run: |
-        make -C build VERBOSE=1 fish_run_tests
-    - name: translation updates
-      run: |
-        # Generate PO files. This should not result it a change in the repo if all translations are
-        # up to date.
-        # Ensure that fish is available as an executable.
-        PATH="$PWD/build:$PATH" build_tools/update_translations.fish
-        # Show diff output. Fail if there is any.
-        git --no-pager diff --exit-code || { echo 'There are uncommitted changes after regenerating the gettext PO files. Make sure to update them via `build_tools/update_translations.fish` after changing source files.'; exit 1; }
-
-  ubuntu-32bit-static-pcre2:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: ./.github/actions/rust-toolchain@oldest-supported
-      with:
-        targets: "i586-unknown-linux-gnu"
-    - name: Install deps
-      uses: ./.github/actions/install-dependencies
-      with:
-        include_pcre: false
-        include_sphinx: false
-    - name: Install g++-multilib
-      run: |
-        sudo apt install g++-multilib
-    - name: cmake
-      env:
-          CFLAGS: "-m32"
-      run: |
-        mkdir build && cd build
-        cmake -DFISH_USE_SYSTEM_PCRE2=OFF -DRust_CARGO_TARGET=i586-unknown-linux-gnu ..
-    - name: make
-      run: |
-        make -C build VERBOSE=1
-    - name: make fish_run_tests
-      run: |
-        make -C build VERBOSE=1 fish_run_tests
-
-  ubuntu-asan:
-    runs-on: ubuntu-latest
-    env:
-        # Rust has two different memory sanitizers of interest; they can't be used at the same time:
-        # * AddressSanitizer detects out-of-bound access, use-after-free, use-after-return,
-        #   use-after-scope, double-free, invalid-free, and memory leaks.
-        # * MemorySanitizer detects uninitialized reads.
-        #
-        RUSTFLAGS: "-Zsanitizer=address"
-        # RUSTFLAGS: "-Zsanitizer=memory -Zsanitizer-memory-track-origins"
-    steps:
-    - uses: actions/checkout@v4
-    # All -Z options require running nightly
-    - uses: dtolnay/rust-toolchain@nightly
-      with:
-        # ASAN uses `cargo build -Zbuild-std` which requires the rust-src component
-        # this is comma-separated
-        components: rust-src
-    - name: Install deps
-      uses: ./.github/actions/install-dependencies
-      with:
-        include_sphinx: false
-    - name: Install llvm
-      run: |
-        sudo apt install llvm # for llvm-symbolizer
-    - name: cmake
-      env:
-          CC: clang
-      run: |
-        mkdir build && cd build
-        # Rust's ASAN requires the build system to explicitly pass a --target triple. We read that
-        # value from CMake variable Rust_CARGO_TARGET.
-        cmake .. -DASAN=1 -DRust_CARGO_TARGET=x86_64-unknown-linux-gnu -DCMAKE_BUILD_TYPE=Debug
-    - name: make
-      run: |
-        make -C build VERBOSE=1
-    - name: make fish_run_tests
-      env:
-          FISH_CI_SAN: 1
-          ASAN_OPTIONS: check_initialization_order=1:detect_stack_use_after_return=1:detect_leaks=1:fast_unwind_on_malloc=0
-          # use_tls=0 is a workaround for LSAN crashing with "Tracer caught signal 11" (SIGSEGV),
-          # which seems to be an issue with TLS support in newer glibc versions under virtualized
-          # environments. Follow https://github.com/google/sanitizers/issues/1342 and
-          # https://github.com/google/sanitizers/issues/1409 to track this issue.
-          # UPDATE: this can cause spurious leak reports for __cxa_thread_atexit_impl() under glibc.
-          LSAN_OPTIONS: verbosity=0:log_threads=0:use_tls=1:print_suppressions=0
-      run: |
-        set -x
-        export ASAN_SYMBOLIZER_PATH=$(command -v /usr/bin/llvm-symbolizer* | sort -n | head -1)
-        export LSAN_OPTIONS="$LSAN_OPTIONS:suppressions=$PWD/build_tools/lsan_suppressions.txt"
-        make -C build VERBOSE=1 fish_run_tests
-
-  macos:
-    runs-on: macos-latest
-    env:
-      # macOS runners keep having issues loading Cargo.toml dependencies from git (GitHub) instead
-      # of crates.io, so give this a try. It's also sometimes significantly faster on all platforms.
-      CARGO_NET_GIT_FETCH_WITH_CLI: true
-    steps:
-    - uses: actions/checkout@v4
-    - uses: ./.github/actions/rust-toolchain@oldest-supported
-    - name: Install deps
-      run: |
-        # --break-system-packages because homebrew has now declared itself "externally managed".
-        # this is CI so we don't actually care.
-        sudo pip3 install --break-system-packages pexpect
-        brew install gettext tmux
-    - uses: ./.github/actions/install-sphinx
-    - name: cmake
-      run: |
-        mkdir build && cd build
-        FISH_TEST_MAX_CONCURRENCY=1 \
-          cmake -DCMAKE_BUILD_TYPE=Debug ..
-    - name: make
-      run: |
-        make -C build VERBOSE=1
-    - name: make fish_run_tests
-      run: |
-        make -C build VERBOSE=1 fish_run_tests
-
-  windows:
-    runs-on: windows-latest
-    defaults:
-      run:
-        shell: msys2 {0}
-    steps:
-    - uses: actions/checkout@v4
-    - uses: msys2/setup-msys2@v2
-      with:
-        update: true
-        msystem: MSYS
-    - name: Install deps
-      # Not using setup-msys2 `install` option to make it easier to copy/paste
-      run: |
-        pacman --noconfirm -S --needed git rust
-    - name: cargo build
-      run: |
-        cargo build
-    - name: smoketest
-      # We can't run `build_tools/check.sh` yet, there are just too many failures
-      # so this is just a quick check to make sure that fish can swim
-      run: |
-        set -x
-        [ "$(target/debug/fish.exe -c 'echo (math 1 + 1)')" = 2 ]
-        cargo test

.gitignore

@@ -1,109 +1,34 @@
-# Note that some of the patterns below should be in an individual's
-# ~/.config/git/ignore file. For example, ".DS_Store" from people working on
-# MacOS.
-
-# File extensions that should never be checked in regardless of which project
-# directory they reside in.
-*.DS_Store
-*.a
-*.app
-*.dll
-*.dylib
-*.exe
-*.gch
-*.la
-*.lai
-*.lib
-*.lo
-*.log
-*.new
 *.o
-*.obj
-*.orig
-!tests/*.out
-*.out
-*.pch
-*.slo
-*.so
-*.xccheckout
-*bak
 *~
-*~HEAD
-.AppleDouble
-.LSOverride
-.Trash-*
-._*
-Desktop.ini
-Thumbs.db
-ehthumbs.db
 
-.directory
-.fuse_hidden*
-
-
-# Directories that only contain transitory files from building and testing.
-/doc/
-/share/man/
-/share/doc/
-/test/
-/user_doc/
-
-# File names that can appear in the project root that represent artifacts from
-# building and testing.
-/FISH-BUILD-VERSION-FILE
-/command_list.txt
-/command_list_toc.txt
-/compile_commands.json
-/doc.h
-/fish
-/fish.pc
-/fish_indent
-/fish_key_reader
-/fish_tests
-/lexicon.txt
-/lexicon_filter
-/toc.txt
-/version
-fish-build-version-witness.txt
-__pycache__
-
-# File names that can appear below the project root that represent artifacts
-# from building and testing.
-/doc_src/commands.hdr
-/doc_src/index.hdr
-/po/*.gmo
-/share/__fish_build_paths.fish
-/share/pkgconfig
-/tests/*.tmp.*
-/tests/.last-check-all-files
-
-# xcode
-## Build generated
-*.moved-aside
-*.xccheckout
-*.xcscmblueprin
-.vscode
-/DerivedData/
-/build/
-/tags
-xcuserdata/
-
-# Generated by Cargo
-# will have compiled files and executables
-debug/
-target/
-
-# These are backup files generated by rustfmt
-**/*.rs.bk
-
-# MSVC Windows builds of rustc generate these, which store debugging information
-*.pdb
-
-# Generated by clangd
-/.cache
-
-# JetBrains editors.
-.idea/
-
-# AI slop
-.claude/
+Doxyfile.help
+Makefile
+autom4te.cache/
+build/
+command_list.txt
+confdefs.h
+config.h
+config.h.in
+config.log
+config.status
+configure
+doc.h
+doc_src/commands.hdr
+doc_src/index.hdr
+po/*.gmo
+fish
+fish.spec
+fish_indent
+fish_pager
+fish_tests
+fishd
+mimedb
+seq
+set_color
+share/config.fish
+share/man/
+toc.txt
+user_doc/
+xcuserdata
+tests/*tmp.*
+tests/foo.txt

.rustfmt.toml

@@ -1 +0,0 @@
-edition = "2024"

BSDmakefile

@@ -1,59 +0,0 @@
-# This is a very basic `make` wrapper around the CMake build toolchain.
-#
-# Supported arguments:
-#   PREFIX: sets the installation prefix
-#   GENERATOR: explicitly specifies the CMake generator to use
-
-# By default, bmake will try to cd into ./obj before anything else. Don't do that.
-.OBJDIR: ./
-
-CMAKE?=cmake
-
-# Before anything else, test for CMake, which is the only requirement to be able to run
-# this Makefile CMake will perform the remaining dependency tests on its own.
-.BEGIN:
-	@which $(CMAKE) >/dev/null 2>/dev/null || \
-		(echo 'Please install CMake and then re-run the `make` command!' 1>&2 && false)
-
-# Prefer to use ninja, if it is installed
-_GENERATOR!=which ninja 2>/dev/null >/dev/null && echo Ninja || echo "Unix Makefiles"
-GENERATOR?=$(_GENERATOR)
-
-.if $(GENERATOR) == "Ninja"
-BUILDFILE=build.ninja
-.else
-BUILDFILE=Makefile
-.endif
-
-PREFIX?=/usr/local
-
-.PHONY: build/fish
-build/fish: build/$(BUILDFILE)
-	$(CMAKE) --build build
-
-# Don't split the mkdir into its own rule because that would cause CMake to regenerate the build
-# files after each build (because it adds the mdate of the build directory into the out-of-date
-# calculation tree). GNUmake supports order-only dependencies, BSDmake does not seem to.
-build/$(BUILDFILE):
-	mkdir -p build
-	cd build; $(CMAKE) .. -G "$(GENERATOR)" -DCMAKE_INSTALL_PREFIX="$(PREFIX)" -DCMAKE_EXPORT_COMPILE_COMMANDS=1
-
-.PHONY: install
-install: build/fish
-	$(CMAKE) --build build --target install
-
-.PHONY: clean
-clean:
-	rm -rf build
-
-.PHONY: test
-test: build/fish
-	$(CMAKE) --build build --target fish_run_tests
-
-.PHONY: fish_run_tests
-fish_run_tests: build/fish
-	$(CMAKE) --build build --target fish_run_tests
-
-.PHONY: run
-run: build/fish
-	build/fish

CHANGELOG

@@ -0,0 +1,3 @@
+24-01-2012 Jan Kanis
+  * Added a changelog file
+  * removed unescaping if the 'commandline' builtin is called without the -o (tokenise) flag

CMakeLists.txt

@@ -1,107 +0,0 @@
-cmake_minimum_required(VERSION 3.15)
-
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
-
-project(fish LANGUAGES C)
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-
-set(DEFAULT_BUILD_TYPE "RelWithDebInfo")
-
-if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-    message(STATUS "Setting build type to default '${DEFAULT_BUILD_TYPE}'")
-    set(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}")
-endif()
-
-# Set up standard directories.
-include(GNUInstallDirs)
-
-# Set up PCRE2
-# This sets an environment variable that needs to be available before the Rust stanzas
-include(cmake/PCRE2.cmake)
-
-include(cmake/Rust.cmake)
-
-# Work around issue where archive-built libs go in the wrong place.
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
-
-# Set up the machinery around FISH-BUILD-VERSION-FILE
-# This defines the FBVF variable.
-include(Version)
-
-# Set up the docs.
-include(cmake/Docs.cmake)
-
-# Tell Cargo where our build directory is so it can find Cargo.toml.
-set(VARS_FOR_CARGO
-    "FISH_CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR}"
-    "PREFIX=${CMAKE_INSTALL_PREFIX}"
-    "DOCDIR=${CMAKE_INSTALL_FULL_DOCDIR}"
-    "DATADIR=${CMAKE_INSTALL_FULL_DATADIR}"
-    "SYSCONFDIR=${CMAKE_INSTALL_FULL_SYSCONFDIR}"
-    "BINDIR=${CMAKE_INSTALL_FULL_BINDIR}"
-    "CARGO_TARGET_DIR=${FISH_RUST_BUILD_DIR}"
-    "CARGO_BUILD_RUSTC=${Rust_COMPILER}"
-    "${FISH_PCRE2_BUILDFLAG}"
-    "FISH_SPHINX=${SPHINX_EXECUTABLE}"
-)
-
-# Let fish pick up when we're running out of the build directory without installing
-get_filename_component(REAL_CMAKE_BINARY_DIR "${CMAKE_BINARY_DIR}" REALPATH)
-get_filename_component(REAL_CMAKE_SOURCE_DIR "${CMAKE_SOURCE_DIR}" REALPATH)
-add_definitions(-DCMAKE_BINARY_DIR="${REAL_CMAKE_BINARY_DIR}")
-add_definitions(-DCMAKE_SOURCE_DIR="${REAL_CMAKE_SOURCE_DIR}")
-
-set(build_types Release RelWithDebInfo Debug "")
-if(NOT "${CMAKE_BUILD_TYPE}" IN_LIST build_types)
-  message(WARNING "Unsupported build type ${CMAKE_BUILD_TYPE}. If this doesn't build, try one of Release, RelWithDebInfo or Debug")
-endif()
-
-add_custom_target(
-  fish ALL
-  COMMAND
-    "${CMAKE_COMMAND}" -E
-      env ${VARS_FOR_CARGO}
-        ${Rust_CARGO}
-          build --bin fish
-          $<$<CONFIG:Release>:--release>
-          $<$<CONFIG:RelWithDebInfo>:--profile=release-with-debug>
-          --target ${Rust_CARGO_TARGET}
-          --no-default-features
-          --features=${FISH_CARGO_FEATURES}
-          ${CARGO_FLAGS}
-    &&
-    "${CMAKE_COMMAND}" -E
-      copy "${rust_target_dir}/${rust_profile}/fish" "${CMAKE_CURRENT_BINARY_DIR}"
-  WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-  USES_TERMINAL
-)
-
-function(CREATE_LINK target)
-  add_custom_target(
-    ${target} ALL
-    DEPENDS fish
-    COMMAND ln -f fish ${target}
-    WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
-  )
-endfunction(CREATE_LINK)
-
-# Define fish_indent.
-create_link(fish_indent)
-
-# Define fish_key_reader.
-create_link(fish_key_reader)
-
-# Set up tests.
-include(cmake/Tests.cmake)
-
-# Benchmarking support.
-include(cmake/Benchmark.cmake)
-
-# Set up install.
-include(cmake/Install.cmake)
-
-# Mac app.
-include(cmake/MacApp.cmake)
-
-include(FeatureSummary)
-feature_summary(WHAT ALL)

CODE_OF_CONDUCT.md

@@ -1,128 +0,0 @@
-
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, religion, or sexual identity
-and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our
-community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the
-  overall community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or
-  advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email
-  address, without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders.
-All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series
-of actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or
-permanent ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior,  harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within
-the community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.0, available at
-https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
-
-Community Impact Guidelines were inspired by [Mozilla's code of conduct
-enforcement ladder](https://github.com/mozilla/diversity).
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see the FAQ at
-https://www.contributor-covenant.org/faq. Translations are available at
-https://www.contributor-covenant.org/translations.

CONTRIBUTING.rst

@@ -1,397 +0,0 @@
-####################
-Contributing To Fish
-####################
-
-This document tells you how you can contribute to fish.
-
-Fish is free and open source software, distributed under the terms of the GPLv2.
-
-Contributions are welcome, and there are many ways to contribute!
-
-Whether you want to change some of the core Rust source, enhance or add a completion script or function,
-improve the documentation or translate something, this document will tell you how.
-
-
-Mailing List
-============
-
-Send patches to the public mailing list: mailto:~krobelus/fish-shell@lists.sr.ht.
-Archives are available at https://lists.sr.ht/~krobelus/fish-shell/.
-
-GitHub
-======
-
-Fish is available on GitHub, at https://github.com/fish-shell/fish-shell.
-
-First, you'll need an account there, and you'll need a git clone of fish.
-Fork it on GitHub and then run::
-
-  git clone https://github.com/<USERNAME>/fish-shell.git
-
-This will create a copy of the fish repository in the directory fish-shell in your current working directory.
-
-Also, for most changes you want to run the tests and so you'd get a setup to compile fish.
-For that, you'll require:
-
--  Rust - when in doubt, try rustup
--  CMake
--  PCRE2 (headers and libraries) - optional, this will be downloaded if missing
--  gettext (only the msgfmt tool) - optional, for translation support
--  Sphinx - optional, to build the documentation
-
-Of course not everything is required always - if you just want to contribute something to the documentation you'll just need Sphinx,
-and if the change is very simple and obvious you can just send it in. Use your judgement!
-
-Once you have your changes, open a pull request on https://github.com/fish-shell/fish-shell/pulls.
-
-Guidelines
-==========
-
-In short:
-
-- Be conservative in what you need (keep to the agreed minimum supported Rust version, limit new dependencies)
-- Use automated tools to help you (``build_tools/check.sh``)
-
-Commit History
-==============
-
-We use a linear, `recipe-style <https://www.bitsnbites.eu/git-history-work-log-vs-recipe/>`__ history.
-Every commit should pass our checks.
-We do not want "fixup" commits in our history.
-If you notice an issue with a commit in a pull request, or get feedback suggesting changes,
-you should rewrite the commit history and fix the relevant commits directly,
-instead of adding new "fixup" commits.
-When a pull request is ready, we rebase it on top of the current master branch,
-so don't be shy about rewriting the history of commits which are not on master yet.
-Rebasing (not merging) your pull request on the latest version of master is also welcome, especially if it resolves conflicts.
-
-If you're using Git, consider using `jj <https://www.jj-vcs.dev/>`__ to make this easier.
-
-If a commit should close an issue, add a ``Fixes #<issue-number>`` line at the end of the commit description.
-
-Contributing completions
-========================
-
-Completion scripts are the most common contribution to fish, and they are very welcome.
-
-In general, we'll take all well-written completion scripts for a command that is publicly available.
-This means no private tools or personal scripts, and we do reserve the right to reject for other reasons.
-
-Before you try to contribute them to fish, consider if the authors of the tool you are completing want to maintain the script instead.
-Often that makes more sense, specifically because they can add new options to the script immediately once they add them,
-and don't have to maintain one completion script for multiple versions. If the authors no longer wish to maintain the script,
-they can of course always contact the fish maintainers to hand it over, preferably by opening a PR.
-This isn't a requirement - if the authors don't want to maintain it, or you simply don't want to contact them,
-you can contribute your script to fish.
-
-Completion scripts should
-
-1. Use as few dependencies as possible - try to use fish's builtins like ``string`` instead of ``grep`` and ``awk``,
-   use ``python`` to read json instead of ``jq`` (because it's already a soft dependency for fish's tools)
-2. If it uses a common unix tool, use POSIX-compatible invocations - ideally it would work on GNU/Linux, macOS, the BSDs and other systems
-3. Option and argument descriptions should be kept short.
-   The shorter the description, the more likely it is that fish can use more columns.
-4. Function names should start with ``__fish``, and functions should be kept in the completion file unless they're used elsewhere.
-5. Run ``fish_indent`` on your script.
-6. Try not to use minor convenience features right after they are available in fish - we do try to keep completion scripts backportable.
-   If something has a real impact on the correctness or performance, feel free to use it,
-   but if it is just a shortcut, please leave it.
-
-Put your completion script into share/completions/name-of-command.fish. If you have multiple commands, you need multiple files.
-
-If you want to add tests, you probably want to add a littlecheck test. See below for details.
-
-Contributing documentation
-==========================
-
-The documentation is stored in ``doc_src/``, and written in ReStructured Text and built with Sphinx.
-
-To build it locally, run either::
-
-    sphinx-build -j auto -b html doc_src/ /tmp/fish-doc/
-
-which will output HTML docs to /tmp/fish-doc.
-You can open it in a browser and see that it looks okay.
-
-Alternatively, you can use::
-
-    cmake --build build -t sphinx-docs
-
-which outputs to build/user_doc/html/.
-
-The builtins and various functions shipped with fish are documented in doc_src/cmds/.
-
-Code Style
-==========
-
-For formatting, we use:
-
-- ``rustfmt`` for Rust
-- ``fish_indent`` (shipped with fish) for fish script
-- ``ruff format`` for Python
-
-To reformat files, there is a script
-
-::
-
-   build_tools/style.fish --all
-   build_tools/style.fish somefile.rs some.fish
-
-Fish Script Style Guide
------------------------
-
-1. All fish scripts, such as those in the *share/functions* and *tests*
-   directories, should be formatted using the ``fish_indent`` command.
-
-2. Function names should be in all lowercase with words separated by
-   underscores. Private functions should begin with an underscore. The
-   first word should be ``fish`` if the function is unique to fish.
-
-3. The first word of global variable names should generally be ``fish``
-   for public vars or ``_fish`` for private vars to minimize the
-   possibility of name clashes with user defined vars.
-
-Configuring Your Editor for Fish Scripts
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-If you use Vim: Install `vim-fish <https://github.com/dag/vim-fish>`__,
-make sure you have syntax and filetype functionality in ``~/.vimrc``:
-
-::
-
-   syntax enable
-   filetype plugin indent on
-
-Then turn on some options for nicer display of fish scripts in
-``~/.vim/ftplugin/fish.vim``:
-
-::
-
-   " Set up :make to use fish for syntax checking.
-   compiler fish
-
-   " Set this to have long lines wrap inside comments.
-   setlocal textwidth=79
-
-   " Enable folding of block structures in fish.
-   setlocal foldmethod=expr
-
-If you use Emacs: Install
-`fish-mode <https://github.com/wwwjfy/emacs-fish>`__ (also available in
-melpa and melpa-stable) and ``(setq-default indent-tabs-mode nil)`` for
-it (via a hook or in ``use-package``\ s “:init” block). It can also be
-made to run fish_indent via e.g.
-
-.. code:: elisp
-
-   (add-hook 'fish-mode-hook (lambda ()
-       (add-hook 'before-save-hook 'fish_indent-before-save)))
-
-Minimum Supported Rust Version (MSRV) Policy
---------------------------------------------
-
-We support at least the version of ``rustc`` available in Debian Stable.
-
-Testing
-=======
-
-The source code for fish includes a large collection of tests. If you
-are making any changes to fish, running these tests is a good way to make
-sure the behaviour remains consistent and regressions are not
-introduced. Even if you don’t run the tests on your machine, they will
-still be run via GitHub Actions.
-
-You are strongly encouraged to add tests when changing the functionality
-of fish, especially if you are fixing a bug to help ensure there are no
-regressions in the future (i.e., we don’t reintroduce the bug).
-
-Unit tests live next to the implementation in Rust source files, in inline submodules (``mod tests {}``).
-
-System tests live in ``tests/``:
-
-- ``tests/checks`` are run by `littlecheck <https://github.com/ridiculousfish/littlecheck>`__
-  and test noninteractive (script) behavior,
-  except for ``tests/checks/tmux-*`` which test interactive scenarios.
-- ``tests/pexpects`` tests interactive scenarios using `pexpect <https://pexpect.readthedocs.io/en/stable/>`__
-
-When in doubt, the bulk of the tests should be added as a littlecheck test in tests/checks, as they are the easiest to modify and run, and much faster and more dependable than pexpect tests.
-The syntax is fairly self-explanatory.
-It's a fish script with the expected output in ``# CHECK:`` or ``# CHECKERR:`` (for stderr) comments.
-If your littlecheck test has a specific dependency, use ``# REQUIRE: ...`` with a POSIX sh script.
-
-The pexpect tests are written in Python and can simulate input and output to/from a terminal, so they are needed for anything that needs actual interactivity.
-The runner is in tests/pexpect_helper.py, in case you need to modify something there.
-
-These tests can be run via the tests/test_driver.py Python script, which will set up the environment.
-It sets up a temporary $HOME and also uses it as the current directory, so you do not need to create a temporary directory in them.
-
-If you need a command to do something weird to test something, maybe add it to the ``fish_test_helper`` binary (in ``tests/fish_test_helper.c``).
-
-Local testing
--------------
-
-The tests can be run on your local system::
-
-    cargo build
-    # Run unit tests
-    cargo test
-    # Run system tests
-    tests/test_driver.py target/debug
-    # Run a specific system test.
-    tests/test_driver.py target/debug tests/checks/abbr.fish
-
-Here, the first argument to test_driver.py refers to a directory with ``fish``, ``fish_indent`` and ``fish_key_reader`` in it.
-In this example we're in the root of the workspace and have run ``cargo build`` without ``--release``, so it's a debug build.
-
-To run all tests and linters, use::
-
-    build_tools/check.sh
-
-Contributing Translations
-=========================
-
-Fish uses GNU gettext to translate messages from English to other languages.
-We use custom tools for extracting messages from source files and to localize at runtime.
-This means that we do not have a runtime dependency on the gettext library.
-It also means that some features are not supported, such as message context and plurals.
-We also expect all files to be UTF-8-encoded.
-In practice, this should not matter much for contributing translations.
-
-Translation sources are stored in the ``localization/po`` directory and named ``ll_CC.po``,
-where ``ll`` is the two (or possibly three) letter ISO 639-1 language code of the target language
-(e.g. ``pt`` for Portuguese). ``CC`` is an ISO 3166 country/territory code,
-(e.g. ``BR`` for Brazil).
-An example for a valid name is ``pt_BR.po``, indicating Brazilian Portuguese.
-These are the files you will interact with when adding translations.
-
-Adding translations for a new language
---------------------------------------
-
-Creating new translations requires the Gettext tools.
-More specifically, you will need ``msguniq`` and ``msgmerge`` for creating translations for a new
-language.
-To create a new translation, run::
-
-    build_tools/update_translations.fish localization/po/ll_CC.po
-
-This will create a new PO file containing all messages available for translation.
-If the file already exists, it will be updated.
-
-After modifying a PO file, you can recompile fish, and it will integrate the modifications you made.
-This requires that the ``msgfmt`` utility is installed (comes as part of ``gettext``).
-It is important that the ``localize-messages`` cargo feature is enabled, which it is by default.
-You can explicitly enable it using::
-
-    cargo build --features=localize-messages
-
-Use environment variables to tell fish which language to use, e.g.::
-
-    LANG=pt_BR.utf8 fish
-
-or within the running fish shell::
-
-    set LANG pt_BR.utf8
-
-For more options regarding how to choose languages, see
-`the corresponding gettext documentation
-<https://www.gnu.org/software/gettext/manual/html_node/Locale-Environment-Variables.html>`__.
-One neat thing you can do is set a list of languages to check for translations in the order defined
-using the ``LANGUAGE`` variable, e.g.::
-
-    set LANGUAGE pt_BR de_DE
-
-to try to translate messages to Portuguese, if that fails try German, and if that fails too you will
-see the English version defined in the source code.
-
-Modifying existing translations
--------------------------------
-
-If you want to work on translations for a language which already has a corresponding ``po`` file, it
-is sufficient to edit this file. No other changes are necessary.
-
-After recompiling fish, you should be able to see your translations in action. See the previous
-section for details.
-
-Editing PO files
-----------------
-
-Many tools are available for editing translation files, including
-command-line and graphical user interface programs. For simple use, you can use your text editor.
-
-Open up the PO file, for example ``localization/po/sv.po``, and you'll see something like::
-
-    msgid "%s: No suitable job\n"
-    msgstr ""
-
-The ``msgid`` here is the "name" of the string to translate, typically the English string to translate.
-The second line (``msgstr``) is where your translation goes.
-
-For example::
-
-    msgid "%s: No suitable job\n"
-    msgstr "%s: Inget passande jobb\n"
-
-Any ``%s`` or ``%d`` are placeholders that fish will use for formatting at runtime. It is important that they match - the translated string should have the same placeholders in the same order.
-
-Also any escaped characters, like that ``\n`` newline at the end, should be kept so the translation has the same behavior.
-
-Our tests run ``msgfmt --check-format /path/to/file``, so they would catch mismatched placeholders - otherwise fish would crash at runtime when the string is about to be used.
-
-Be cautious about blindly updating an existing translation file.
-``msgid`` strings should never be updated manually, only by running the appropriate script.
-
-Modifications to strings in source files
-----------------------------------------
-
-If a string changes in the sources, the old translations will no longer work.
-They will be preserved in the PO files, but commented-out (starting with ``#~``).
-If you add/remove/change a translatable strings in a source file,
-run ``build_tools/update_translations.fish`` to propagate this to all translation files (``localization/po/*.po``).
-This is only relevant for developers modifying the source files of fish or fish scripts.
-
-Setting Code Up For Translations
---------------------------------
-
-All non-debug messages output for user consumption should be marked for
-translation. In Rust, this requires the use of the ``wgettext!`` or ``wgettext_fmt!``
-macros:
-
-::
-
-    streams.out.append(wgettext_fmt!("%s: There are no jobs\n", argv[0]));
-
-All messages in fish script must be enclosed in single or double quote
-characters for our message extraction script to find them.
-They must also be translated via a command substitution. This means
-that the following are **not** valid:
-
-::
-
-    echo (_ hello)
-    _ "goodbye"
-
-Above should be written like this instead:
-
-::
-
-    echo (_ "hello")
-    echo (_ "goodbye")
-
-You can use either single or double quotes to enclose the
-message to be translated. You can also optionally include spaces after
-the opening parentheses or before the closing parentheses.
-
-Updating Dependencies
-=====================
-
-To update dependencies, run ``build_tools/update-dependencies.sh``.
-This currently requires `updatecli <https://github.com/updatecli/updatecli>`__ and a few other tools.
-
-Versioning
-==========
-
-The fish version is constructed by the *build_tools/git_version_gen.sh*
-script. For developers the version is the branch name plus the output of
-``git describe --always --dirty``. Normally the main part of the version
-will be the closest annotated tag. Which itself is usually the most
-recent release number (e.g., ``2.6.0``).

COPYING

@@ -1,20 +0,0 @@
-Fish is a smart and user-friendly command line shell.
-
-Copyright (C) 2005-2009 Axel Liljencrantz
-Copyright (C) 2009- fish-shell contributors
-
-fish is free software.
-
-Most of fish is licensed under the GNU General Public License version 2, and
-you can redistribute it and/or modify it under the terms of the GNU GPL as
-published by the Free Software Foundation.
-
-fish also includes software licensed under the Python Software Foundation License version 2, the MIT
-license, and the GNU Library General Public License version 2.
-
-Full licensing information is contained in doc_src/license.rst.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-more details.

Cargo.toml

@@ -1,205 +0,0 @@
-[workspace]
-members = ["crates/*"]
-
-[workspace.package]
-# To build revisions that use Corrosion (those before 2024-01), use CMake 3.19, Rustc 1.78 and Rustup 1.27.
-rust-version = "1.85"
-edition = "2024"
-repository = "https://github.com/fish-shell/fish-shell"
-# see doc_src/license.rst for details
-# don't forget to update COPYING and debian/copyright too
-license = "GPL-2.0-only AND LGPL-2.0-or-later AND MIT AND PSF-2.0"
-
-[workspace.dependencies]
-bitflags = "2.5.0"
-cc = "1.0.94"
-cfg-if = "1.0.3"
-errno = "0.3.0"
-fish-build-helper = { path = "crates/build-helper" }
-fish-build-man-pages = { path = "crates/build-man-pages" }
-fish-common = { path = "crates/common" }
-fish-fallback = { path = "crates/fallback" }
-fish-gettext = { path = "crates/gettext" }
-fish-gettext-extraction = { path = "crates/gettext-extraction" }
-fish-gettext-maps = { path = "crates/gettext-maps" }
-fish-gettext-mo-file-parser = { path = "crates/gettext-mo-file-parser" }
-fish-printf = { path = "crates/printf", features = ["widestring"] }
-fish-tempfile = { path = "crates/tempfile" }
-fish-wchar = { path = "crates/wchar" }
-fish-widecharwidth = { path = "crates/widecharwidth" }
-libc = "0.2.177"
-# lru pulls in hashbrown by default, which uses a faster (though less DoS resistant) hashing algo.
-# disabling default features uses the stdlib instead, but it doubles the time to rewrite the history
-# files as of 22 April 2024.
-lru = "0.16.2"
-nix = { version = "0.30.1", default-features = false, features = [
-    "event",
-    "inotify",
-    "resource",
-    "fs",
-    "term",
-] }
-num-traits = "0.2.19"
-once_cell = "1.19.0"
-pcre2 = { git = "https://github.com/fish-shell/rust-pcre2", tag = "0.2.9-utf32", default-features = false, features = [
-    "utf32",
-] }
-phf = { version = "0.13", default-features = false }
-phf_codegen = "0.13"
-portable-atomic = { version = "1", default-features = false, features = [
-    "fallback",
-] }
-proc-macro2 = "1.0"
-rand = { version = "0.9.2", default-features = false, features = [
-    "small_rng",
-    "thread_rng",
-] }
-rsconf = "0.3.0"
-rust-embed = { version = "8.9.0", features = [
-    "deterministic-timestamps",
-    "include-exclude",
-    "interpolate-folder-path",
-] }
-serial_test = { version = "3", default-features = false }
-# We need 0.9.0 specifically for some crash fixes.
-terminfo = "0.9.0"
-widestring = "1.2.0"
-unicode-segmentation = "1.12.0"
-unicode-width = "0.2.0"
-unix_path = "1.0.1"
-xterm-color = "1.0.1"
-
-[profile.release]
-overflow-checks = true
-lto = true
-
-[profile.release-with-debug]
-inherits = "release"
-debug = true
-
-[package]
-name = "fish"
-version = "4.3.3"
-edition.workspace = true
-rust-version.workspace = true
-default-run = "fish"
-license.workspace = true
-homepage = "https://fishshell.com"
-readme = "README.rst"
-
-[dependencies]
-bitflags.workspace = true
-cfg-if.workspace = true
-errno.workspace = true
-fish-build-helper.workspace = true
-fish-build-man-pages = { workspace = true, optional = true }
-fish-common.workspace = true
-fish-fallback.workspace = true
-fish-gettext = { workspace = true, optional = true }
-fish-gettext-extraction = { workspace = true, optional = true }
-fish-printf.workspace = true
-fish-tempfile.workspace = true
-fish-wchar.workspace = true
-fish-widecharwidth.workspace = true
-libc.workspace = true
-lru.workspace = true
-macro_rules_attribute = "0.2.2"
-nix.workspace = true
-num-traits.workspace = true
-once_cell.workspace = true
-pcre2.workspace = true
-rand.workspace = true
-terminfo.workspace = true
-xterm-color.workspace = true
-widestring.workspace = true
-
-[target.'cfg(not(target_has_atomic = "64"))'.dependencies]
-portable-atomic.workspace = true
-
-[target.'cfg(windows)'.dependencies]
-rust-embed = { workspace = true, features = [
-    "deterministic-timestamps",
-    "debug-embed",
-    "include-exclude",
-    "interpolate-folder-path",
-] }
-[target.'cfg(not(windows))'.dependencies]
-rust-embed = { workspace = true, features = [
-    "deterministic-timestamps",
-    "include-exclude",
-    "interpolate-folder-path",
-] }
-
-[dev-dependencies]
-serial_test.workspace = true
-
-[build-dependencies]
-cc.workspace = true
-fish-build-helper.workspace = true
-fish-gettext-mo-file-parser.workspace = true
-phf_codegen = { workspace = true, optional = true }
-rsconf.workspace = true
-
-[target.'cfg(windows)'.build-dependencies]
-unix_path.workspace = true
-
-[lib]
-crate-type = ["rlib"]
-path = "src/lib.rs"
-
-[[bin]]
-name = "fish"
-path = "src/bin/fish.rs"
-
-[[bin]]
-name = "fish_indent"
-path = "src/bin/fish_indent.rs"
-
-[[bin]]
-name = "fish_key_reader"
-path = "src/bin/fish_key_reader.rs"
-
-[features]
-default = ["embed-manpages", "localize-messages"]
-benchmark = []
-embed-manpages = ["dep:fish-build-man-pages"]
-# Enable gettext localization at runtime. Requires the `msgfmt` tool to generate catalog data at
-# build time.
-localize-messages = ["dep:fish-gettext"]
-# This feature is used to enable extracting messages from the source code for localization.
-# It only needs to be enabled if updating these messages (and the corresponding PO files) is
-# desired. This happens when running tests via `build_tools/check.sh` and when calling
-# `build_tools/update_translations.fish`, so there should not be a need to enable it manually.
-gettext-extract = ["dep:fish-gettext-extraction"]
-
-# The following features are auto-detected by the build-script and should not be enabled manually.
-asan = []
-tsan = []
-
-[workspace.lints]
-rust.non_camel_case_types = "allow"
-rust.non_upper_case_globals = "allow"
-rust.unknown_lints = "allow"
-rust.unstable_name_collisions = "allow"
-rustdoc.private_intra_doc_links = "allow"
-
-[workspace.lints.clippy]
-assigning_clones = "warn"
-implicit_clone = "warn"
-cloned_instead_of_copied = "warn"
-len_without_is_empty = "allow"     # we're not a library crate
-let_and_return = "allow"
-manual_range_contains = "allow"
-map_unwrap_or = "warn"
-needless_lifetimes = "allow"
-new_without_default = "allow"
-option_map_unit_fn = "allow"
-
-# We do not want to use the e?print(ln)?! macros.
-# These lints flag their use.
-# In the future, they might change to flag other methods of printing.
-print_stdout = "deny"
-print_stderr = "deny"
-
-[lints]
-workspace = true

Dockerfile

@@ -1,18 +0,0 @@
-FROM centos:latest
-
-# Build dependency
-RUN yum update -y &&\
-  yum install -y epel-release &&\
-  yum install -y clang cmake3 gcc-c++ make &&\
-  yum clean all
-
-# Test dependency
-RUN yum install -y expect vim-common
-
-ADD . /src
-WORKDIR /src
-
-# Build fish
-RUN cmake3 . &&\
-  make &&\
-  make install

Doxyfile.user

@@ -0,0 +1,161 @@
+PROJECT_NAME           = fish
+PROJECT_NUMBER         = 1
+OUTPUT_DIRECTORY       = user_doc
+CREATE_SUBDIRS         = NO
+OUTPUT_LANGUAGE        = English
+USE_WINDOWS_ENCODING   = NO
+BRIEF_MEMBER_DESC      = YES
+REPEAT_BRIEF           = YES
+ABBREVIATE_BRIEF       = YES
+ALWAYS_DETAILED_SEC    = NO
+INLINE_INHERITED_MEMB  = NO
+FULL_PATH_NAMES        = YES
+STRIP_FROM_PATH        =
+STRIP_FROM_INC_PATH    =
+SHORT_NAMES            = NO
+JAVADOC_AUTOBRIEF      = YES
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP         = NO
+INHERIT_DOCS           = YES
+DISTRIBUTE_GROUP_DOC   = NO
+TAB_SIZE               = 8
+ALIASES                =
+OPTIMIZE_OUTPUT_FOR_C  = YES
+OPTIMIZE_OUTPUT_JAVA   = NO
+SUBGROUPING            = YES
+EXTRACT_ALL            = NO
+EXTRACT_PRIVATE        = NO
+EXTRACT_STATIC         = YES
+EXTRACT_LOCAL_CLASSES  = YES
+EXTRACT_LOCAL_METHODS  = NO
+HIDE_UNDOC_MEMBERS     = NO
+HIDE_UNDOC_CLASSES     = NO
+HIDE_FRIEND_COMPOUNDS  = NO
+HIDE_IN_BODY_DOCS      = NO
+INTERNAL_DOCS          = NO
+CASE_SENSE_NAMES       = YES
+HIDE_SCOPE_NAMES       = NO
+SHOW_INCLUDE_FILES     = YES
+INLINE_INFO            = YES
+SORT_MEMBER_DOCS       = YES
+SORT_BRIEF_DOCS        = NO
+SORT_BY_SCOPE_NAME     = NO
+GENERATE_TODOLIST      = YES
+GENERATE_TESTLIST      = YES
+GENERATE_BUGLIST       = YES
+GENERATE_DEPRECATEDLIST= YES
+ENABLED_SECTIONS       =
+MAX_INITIALIZER_LINES  = 30
+SHOW_USED_FILES        = YES
+SHOW_DIRECTORIES       = YES
+QUIET                  = NO
+WARNINGS               = YES
+WARN_IF_UNDOCUMENTED   = YES
+WARN_IF_DOC_ERROR      = YES
+WARN_FORMAT            = "$file:$line: $text"
+WARN_LOGFILE           =
+INPUT                  =
+FILE_PATTERNS          =  doc.h
+RECURSIVE              = NO
+EXCLUDE                =
+EXCLUDE_SYMLINKS       = NO
+EXCLUDE_PATTERNS       =
+EXAMPLE_PATH           =
+EXAMPLE_PATTERNS       =
+EXAMPLE_RECURSIVE      = NO
+IMAGE_PATH             =
+INPUT_FILTER           =
+FILTER_PATTERNS        =
+FILTER_SOURCE_FILES    = NO
+SOURCE_BROWSER         = NO
+INLINE_SOURCES         = NO
+STRIP_CODE_COMMENTS    = YES
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION    = YES
+VERBATIM_HEADERS       = YES
+ALPHABETICAL_INDEX     = NO
+COLS_IN_ALPHA_INDEX    = 5
+IGNORE_PREFIX          =
+GENERATE_HTML          = YES
+HTML_OUTPUT            = html
+HTML_FILE_EXTENSION    = .html
+HTML_HEADER            = user_doc.head.html
+HTML_FOOTER            =
+HTML_STYLESHEET        =
+HTML_ALIGN_MEMBERS     = YES
+GENERATE_HTMLHELP      = NO
+CHM_FILE               =
+HHC_LOCATION           =
+GENERATE_CHI           = NO
+BINARY_TOC             = NO
+TOC_EXPAND             = NO
+DISABLE_INDEX          = YES
+ENUM_VALUES_PER_LINE   = 4
+GENERATE_TREEVIEW      = NO
+TREEVIEW_WIDTH         = 250
+GENERATE_LATEX         = NO
+LATEX_OUTPUT           = latex
+LATEX_CMD_NAME         = latex
+MAKEINDEX_CMD_NAME     = makeindex
+COMPACT_LATEX          = NO
+PAPER_TYPE             = a4wide
+EXTRA_PACKAGES         =
+LATEX_HEADER           =
+PDF_HYPERLINKS         = YES
+USE_PDFLATEX           = YES
+LATEX_BATCHMODE        = NO
+LATEX_HIDE_INDICES     = NO
+GENERATE_RTF           = NO
+RTF_OUTPUT             = rtf
+COMPACT_RTF            = NO
+RTF_HYPERLINKS         = NO
+RTF_STYLESHEET_FILE    =
+RTF_EXTENSIONS_FILE    =
+GENERATE_MAN           = NO
+MAN_OUTPUT             = man
+MAN_EXTENSION          = .3
+MAN_LINKS              = NO
+GENERATE_XML           = NO
+XML_OUTPUT             = xml
+XML_SCHEMA             =
+XML_DTD                =
+XML_PROGRAMLISTING     = YES
+GENERATE_AUTOGEN_DEF   = NO
+GENERATE_PERLMOD       = NO
+PERLMOD_LATEX          = NO
+PERLMOD_PRETTY         = YES
+PERLMOD_MAKEVAR_PREFIX =
+ENABLE_PREPROCESSING   = YES
+MACRO_EXPANSION        = NO
+EXPAND_ONLY_PREDEF     = NO
+SEARCH_INCLUDES        = YES
+INCLUDE_PATH           =
+INCLUDE_FILE_PATTERNS  =
+PREDEFINED             =
+EXPAND_AS_DEFINED      =
+SKIP_FUNCTION_MACROS   = YES
+TAGFILES               =
+GENERATE_TAGFILE       =
+ALLEXTERNALS           = NO
+EXTERNAL_GROUPS        = YES
+PERL_PATH              = /usr/bin/perl
+CLASS_DIAGRAMS         = YES
+HIDE_UNDOC_RELATIONS   = YES
+HAVE_DOT               = NO
+CLASS_GRAPH            = NO
+COLLABORATION_GRAPH    = YES
+UML_LOOK               = NO
+TEMPLATE_RELATIONS     = NO
+INCLUDE_GRAPH          = NO
+INCLUDED_BY_GRAPH      = YES
+CALL_GRAPH             = YES
+GRAPHICAL_HIERARCHY    = YES
+DOT_IMAGE_FORMAT       = png
+DOT_PATH               =
+DOTFILE_DIRS           =
+MAX_DOT_GRAPH_WIDTH    = 750
+MAX_DOT_GRAPH_HEIGHT   = 1024
+MAX_DOT_GRAPH_DEPTH    = 0
+GENERATE_LEGEND        = YES
+DOT_CLEANUP            = YES
+SEARCHENGINE           = NO

GNUmakefile

@@ -1,76 +0,0 @@
-# This is a very basic `make` wrapper around the CMake build toolchain.
-#
-# Supported arguments:
-#   PREFIX: sets the installation prefix
-#   GENERATOR: explicitly specifies the CMake generator to use
-
-CMAKE ?= cmake
-
-GENERATOR ?= $(shell (which ninja > /dev/null 2> /dev/null && echo Ninja) || \
-			 echo 'Unix Makefiles')
-prefix ?= /usr/local
-PREFIX ?= $(prefix)
-
-ifeq ($(GENERATOR), Ninja)
-BUILDFILE = build.ninja
-else
-BUILDFILE = Makefile
-endif
-
-
-# If CMake has generated an in-tree Makefile, use that instead (issue #6264)
-MAKE_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
-ifeq ($(shell test -f $(MAKE_DIR)/Makefile && echo 1), 1)
-
-all:
-	@+$(MAKE) -f $(MAKE_DIR)/Makefile $(MAKECMDGOALS) --no-print-directory
-%:
-	@+$(MAKE) -f $(MAKE_DIR)/Makefile $(MAKECMDGOALS) --no-print-directory
-
-else
-
-all: .begin build/fish
-
-.PHONY: .begin
-.begin:
-	@which $(CMAKE) > /dev/null 2> /dev/null || \
-		 (echo 'Please install CMake and then re-run the `make` command!' 1>&2 && false)
-
-.PHONY: build/fish
-build/fish: build/$(BUILDFILE)
-	$(CMAKE) --build build
-
-# Use build as an order-only dependency. This prevents the target from always being outdated
-# after a make run, and more importantly, doesn't clobber manually specified CMake options.
-build/$(BUILDFILE): | build
-	cd build; $(CMAKE) .. -G "$(GENERATOR)" \
-		-DCMAKE_INSTALL_PREFIX="$(PREFIX)" -DCMAKE_EXPORT_COMPILE_COMMANDS=1
-
-build:
-	mkdir -p build
-
-.PHONY: clean
-clean:
-	rm -rf build
-
-.PHONY: test
-test: build/fish
-	$(CMAKE) --build build --target fish_run_tests
-
-.PHONY: fish_run_tests
-fish_run_tests: build/fish
-	$(CMAKE) --build build --target fish_run_tests
-
-.PHONY: install
-install: build/fish
-	$(CMAKE) --build build --target install
-
-.PHONY: run
-run: build/fish
-	./build/fish || true
-
-.PHONY: exec
-exec: build/fish
-	exec ./build/fish
-
-endif # CMake in-tree build check

Makefile.in

@@ -0,0 +1,985 @@
+
+# Copyright (C) 2005-2006 Axel Liljencrantz
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+
+#
+# @configure_input@
+#
+
+#
+# Makefile for the fish shell. Can build fish and associated
+# applications, install them, recalculate dependencies and also create
+# binary distributions in tar.bz2, tar.gz and rpm formats.
+#
+
+#
+# The fish buildprocess is quite complex. Do not stare directly into
+# the Makefile. Doing so may cause nausea, dizziness and
+# hallucinations.
+#
+
+# Used by docdir
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+
+#
+# Programs
+#
+
+CXX := @CXX@
+INSTALL:=@INSTALL@
+
+
+#
+# Installation directories
+#
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
+datadir = @datadir@
+bindir = @bindir@
+mandir = @mandir@
+sysconfdir = @sysconfdir@
+docdir = @docdir@
+localedir = @localedir@
+optbindirs = @optbindirs@
+
+#
+# Various flags
+#
+
+MACROS = -DLOCALEDIR=\"$(localedir)\" -DPREFIX=L\"$(prefix)\" -DDATADIR=L\"$(datadir)\" -DSYSCONFDIR=L\"$(sysconfdir)\" -DBINDIR=L\"$(bindir)\"
+CXXFLAGS = @CXXFLAGS@ $(MACROS) $(EXTRA_CXXFLAGS)
+LDFLAGS = @LIBS@ @LDFLAGS@
+LDFLAGS_FISH = ${LDFLAGS} @LIBS_FISH@ @LDFLAGS_FISH@
+LDFLAGS_FISH_INDENT = ${LDFLAGS} @LIBS_FISH_INDENT@
+LDFLAGS_FISH_PAGER = ${LDFLAGS} @LIBS_FISH_PAGER@
+LDFLAGS_FISHD = ${LDFLAGS} @LIBS_FISHD@
+LDFLAGS_MIMEDB = ${LDFLAGS} @LIBS_MIMEDB@
+
+#
+# Set to 1 if we have gettext
+#
+
+HAVE_GETTEXT=@HAVE_GETTEXT@
+
+
+#
+#Additional .cpp files used by common.o. These also have a corresponding
+#.h file.
+#
+
+COMMON_FILES := util.cpp fallback.cpp
+
+
+#
+# All objects that the system needs to build fish, except fish.o
+#
+
+FISH_OBJS := function.o builtin.o complete.o env.o exec.o expand.o		\
+	highlight.o history.o kill.o parser.o proc.o reader.o sanity.o		\
+	tokenizer.o wildcard.o wgetopt.o wutil.o input.o output.o intern.o	\
+	env_universal.o env_universal_common.o input_common.o event.o		\
+	signal.o io.o parse_util.o common.o screen.o path.o autoload.o		\
+	parser_keywords.o iothread.o color.o postfork.o	\
+	builtin_test.o
+
+FISH_INDENT_OBJS := fish_indent.o print_help.o common.o	\
+parser_keywords.o wutil.o tokenizer.o
+
+#
+# Additional files used by builtin.o
+#
+
+BUILTIN_FILES := builtin_set.cpp builtin_commandline.cpp	\
+	builtin_ulimit.cpp builtin_complete.cpp builtin_jobs.cpp	\
+	builtin_set_color.cpp builtin_printf.cpp
+
+
+#
+# All objects that the system needs to build fish_pager
+#
+
+FISH_PAGER_OBJS := fish_pager.o output.o wutil.o 		\
+	input_common.o env_universal.o env_universal_common.o common.o	\
+	print_help.o iothread.o color.o
+
+
+#
+# All objects that the system needs to build fish_tests
+#
+
+FISH_TESTS_OBJS := $(FISH_OBJS) fish_tests.o
+
+
+#
+# All objects that the system needs to build fishd
+#
+
+FISHD_OBJS := fishd.o env_universal_common.o wutil.o print_help.o	\
+	common.o
+
+
+#
+# All objects needed to build mimedb
+#
+
+MIME_OBJS := mimedb.o print_help.o xdgmimealias.o xdgmime.o				\
+	xdgmimeglob.o xdgmimeint.o xdgmimemagic.o xdgmimeparent.o wutil.o	\
+	common.o
+
+
+#
+# Files containing user documentation
+#
+
+#
+# These files are the source files, they contain a few @FOO@-style substitutions
+#
+
+HDR_FILES_SRC := doc_src/index.hdr.in doc_src/commands.hdr.in doc_src/design.hdr doc_src/license.hdr doc_src/faq.hdr
+
+
+#
+# These are the generated result files
+#
+
+HDR_FILES := $(HDR_FILES_SRC:.hdr.in=.hdr)
+
+# Use a pattern rule so that Make knows to only issue one invocation
+# per http://www.gnu.org/software/make/manual/make.html#Pattern-Intro
+
+# Internalized scripts are currently disabled.
+# For now, we just generate empty arrays.
+# To generate them again, you would run this:
+# ./internalize_scripts.py share/functions/*.fish share/completions/*.fish
+
+
+#
+# Files containing documentation for external commands.
+#
+
+HELP_SRC := $(wildcard doc_src/*.txt)
+
+
+#
+# Files in the test directory
+#
+
+TEST_IN := $(wildcard tests/test*.in)
+
+
+#
+# Files that should be added to the tar archives
+#
+
+#
+# Files in ./doc_src/
+#
+
+DOC_SRC_DIR_FILES := $(HDR_FILES_SRC) $(HELP_SRC)
+
+
+#
+# Files in ./
+#
+
+MAIN_DIR_FILES_UNSORTED := Doxyfile Doxyfile.user Doxyfile.help					\
+    Makefile.in configure configure.ac config.h.in install-sh					\
+    key_reader.cpp $(MIME_OBJS:.o=.h)											\
+    $(MIME_OBJS:.o=.cpp) $(FISH_OBJS:.o=.h) $(BUILTIN_FILES)					\
+    $(COMMON_FILES) $(COMMON_FILES:.cpp=.h) $(FISH_OBJS:.o=.cpp)				\
+    fish.spec.in INSTALL README user_doc.head.html								\
+    ChangeLog config.sub config.guess fish_tests.cpp fish.cpp fish_pager.cpp	\
+    fishd.cpp make_vcs_completions.fish $(FISH_INDENT_OBJS:.o=.cpp)
+
+#
+# The sorting is not meaningful in itself, but it has the side effect
+# of removing duplicates, which means there will be fewer warnings
+# during building.
+#
+
+MAIN_DIR_FILES := $(sort $(MAIN_DIR_FILES_UNSORTED))
+
+
+#
+# Files in ./tests/
+#
+
+TESTS_DIR_FILES := $(TEST_IN) $(TEST_IN:.in=.out) $(TEST_IN:.in=.err)	\
+	$(TEST_IN:.in=.status) tests/test.fish tests/gen_output.fish
+
+
+#
+# Files in ./share/completions/
+#
+
+COMPLETIONS_DIR_FILES := $(wildcard share/completions/*.fish)
+
+
+#
+# Files in ./share/functions/
+#
+
+FUNCTIONS_DIR_FILES := $(wildcard share/functions/*.fish)
+
+
+#
+# Programs to install
+#
+
+PROGRAMS := fish mimedb fish_pager fishd fish_indent
+
+#
+# Manual pages to install
+#
+
+MANUALS := $(addsuffix .1, $(addprefix share/man/man1/,	\
+	$(PROGRAMS)))
+
+
+#
+# All translation message catalogs
+#
+
+TRANSLATIONS_SRC := $(wildcard po/*.po)
+TRANSLATIONS := $(TRANSLATIONS_SRC:.po=.gmo)
+
+
+#
+# Make everything needed for installing fish
+#
+
+all: $(PROGRAMS) user_doc share/man $(TRANSLATIONS)
+	@echo fish has now been built.
+	@echo Use \'$(MAKE) install\' to install fish.
+.PHONY: all
+
+
+#
+# These dependencies make sure that autoconf and configure are run
+# when the source code for the build configuration has changed.
+#
+
+configure: configure.ac
+	./config.status --recheck
+
+Makefile: Makefile.in configure
+	./config.status
+
+
+#
+# Build fish with some debug flags specified. This is GCC specific,
+# and should only be used when debuging fish.
+#
+
+prof: EXTRA_CXXFLAGS += -pg
+prof: LDFLAGS += -pg
+prof: all
+.PHONY: prof
+
+#
+# User documentation, describing the features of the fish shell.
+#
+
+# Depend on the sources (*.hdr.in) and manually make the
+# intermediate *.hdr and doc.h files if needed
+# Allow doxygen to fail, e.g. if it does not exist
+
+user_doc: $(HDR_FILES_SRC) Doxyfile.user user_doc.head.html $(HELP_SRC) doc.h $(HDR_FILES)
+	- (cat Doxyfile.user ; echo PROJECT_NUMBER=@PACKAGE_VERSION@) | doxygen - && touch user_doc
+
+
+#
+# Source code documentation. Also includes user documentation.
+#
+
+doc: *.h *.cpp doc.h Doxyfile
+	(cat Doxyfile ; echo PROJECT_NUMBER=@PACKAGE_VERSION@) | doxygen - ;
+
+
+#
+# PDF version of the source code documentation.
+#
+
+doc/refman.pdf: doc
+	cd doc/latex;
+	make;
+	mv refman.pdf ..;
+	cd ../..;
+	rm -r doc/latex;
+
+
+#
+# This target runs both the low level code tests and the high level script tests.
+#
+
+test: $(PROGRAMS) fish_tests
+	./fish_tests; cd tests; ../fish <test.fish;
+.PHONY: test
+
+
+#
+# commands.hdr collects documentation on all commands, functions and
+# builtins
+#
+
+doc_src/commands.hdr:$(HELP_SRC) doc_src/commands.hdr.in
+	-rm command_list.tmp $@
+	for i in `printf "%s\n" $(HELP_SRC)|sort`; do \
+		echo "<hr>" >>command_list.tmp; \
+		cat $$i >>command_list.tmp; \
+		echo >>command_list.tmp; \
+		echo >>command_list.tmp; \
+		echo "Back to <a href='index.html#toc-commands'>index</a>". >>command_list.tmp; \
+	done
+	mv command_list.tmp command_list.txt
+	cat $@.in | awk '{if ($$0 ~ /@command_list@/){ system("cat command_list.txt");} else{ print $$0;}}' >$@
+
+
+toc.txt: $(HDR_FILES:index.hdr=index.hdr.in)
+	-rm toc.tmp $@
+	for i in $(HDR_FILES:index.hdr=index.hdr.in); do\
+		NAME=`basename $$i .hdr`; \
+		NAME=`basename $$NAME .hdr.in`; \
+		sed <$$i >>toc.tmp -n \
+		-e 's,.*\\page *\([^ ]*\) *\(.*\)$$,- <a href="'$$NAME'.html" id="toc-'$$NAME'">\2</a>,p' \
+		-e 's,.*\\section *\([^ ]*\) *\(.*\)$$,  - <a href="'$$NAME'.html#\1">\2</a>,p'; \
+	done
+	mv toc.tmp $@
+
+doc_src/index.hdr: toc.txt doc_src/index.hdr.in
+	cat $@.in | awk '{if ($$0 ~ /@toc@/){ system("cat toc.txt");} else{ print $$0;}}' >$@
+
+
+#
+# doc.h is a compilation of the various snipptes of text used both for
+# the user documentation and for internal help functions into a single
+# file that can be parsed dy Doxygen to generate the user
+# documentation.
+#
+
+doc.h: $(HDR_FILES)
+	cat $(HDR_FILES) >$@
+
+#
+# This rule creates complete doxygen headers from each of the various
+# snipptes of text used both for the user documentation and for
+# internal help functions, that can be parsed to Doxygen to generate
+# the internal help function text.
+#
+
+%.doxygen:%.txt
+	echo  "/** \page " `basename $*` >$@;
+	cat $*.txt >>$@;
+	echo "*/" >>$@
+
+%: %.in
+	sed <$@.in >$@ \
+		-e "s,@sysconfdir\@,$(sysconfdir),g" \
+		-e "s,@datadir\@,$(datadir),g" \
+		-e "s,@docdir\@,$(docdir),g" \
+		-e "s|@configure_input\@|$@, generated from $@.in by the Makefile. DO NOT MANUALLY EDIT THIS FILE!|g" \
+		-e "s,@prefix\@,$(prefix),g" \
+		-e "s,@optbindirs\@,$(optbindirs),g"
+#-e "s,@\@,$(),"
+
+
+#
+# Compile translation files to binary format
+#
+
+%.gmo:
+	if test "$(HAVE_GETTEXT)" = 1; then \
+		msgfmt -o $*.gmo $*.po; \
+	fi
+
+
+#
+# Update existing po file or copy messages.pot
+#
+
+%.po:messages.pot
+	if test $(HAVE_GETTEXT) = 1;then \
+		if test -f $*.po; then \
+			msgmerge -U --backup=existing $*.po messages.pot;\
+		else \
+			cp messages.pot $*.po;\
+		fi; \
+	fi
+
+
+#
+# Create a template translation object
+#
+
+messages.pot: *.cpp *.h share/completions/*.fish share/functions/*.fish
+	if test $(HAVE_GETTEXT) = 1;then \
+		xgettext -k_ -kN_ *.cpp *.h -o messages.pot; \
+		if xgettext -j -k_ -kN_ -k--description -LShell share/completions/*.fish share/functions/*.fish -o messages.pot; then true; else \
+			echo "Your xgettext version is too old to build the messages.pot file"\
+			rm messages.pot\
+			false;\
+		fi; \
+	fi
+
+builtin.o: $(BUILTIN_FILES)
+
+common.o: $(COMMON_FILES)
+
+
+#
+# Generate the internal help functions by making doxygen create
+# man-pages. The convertion path looks like this:
+#
+#   .txt file
+#       ||
+#     (make)
+#       ||
+#       \/
+#  .doxygen file
+#       ||
+#    (doxygen)
+#       ||
+#       \/
+#    roff file
+#       ||
+# (__fish_print_help)
+#       ||
+#       \/
+#   formated text
+#   with escape
+#    sequences
+#
+#
+# There ought to be something simpler.
+#
+
+share/man: $(HELP_SRC)
+	-mkdir share/man
+	touch share/man
+	-rm -Rf share/man/man1
+	./build_tools/build_documentation.sh Doxyfile.help ./doc_src ./share
+
+#
+# The build rules for installing/uninstalling fish
+#
+
+#
+# Check for an incompatible installed fish version, and fail with an
+# error if found
+#
+
+check-uninstall:
+	if test -f $(DESTDIR)$(sysconfdir)/fish.d/fish_function.fish -o -f $(DESTDIR)$(sysconfdir)/fish.d/fish_complete.fish; then \
+		echo;\
+		echo ERROR;\
+		echo;\
+		echo An older fish installation using an incompatible filesystem hierarchy was detected;\
+		echo You must uninstall this fish version before proceeding;\
+		echo type \'$(MAKE) uninstall-legacy\' to uninstall these files,;\
+		echo or type \'$(MAKE) force-install\' to force installation.;\
+		echo The latter may result in a broken installation.;\
+		echo;\
+		false;\
+	fi;
+	if test -f $(DESTDIR)$(sysconfdir)/fish; then \
+		echo;\
+		echo ERROR;\
+		echo;\
+		echo An older fish installation using an incompatible filesystem hierarchy was detected;\
+		echo You must remove the file $(DESTDIR)$(sysconfdir)/fish before proceeding;\
+		echo type \'$(MAKE) uninstall-legacy\' to uninstall this file,;\
+		echo or remove it manually using \'rm $(DESTDIR)$(sysconfdir)/fish\'.;\
+		echo;\
+		false;\
+	fi;
+.PHONY: check-uninstall
+
+check-legacy-binaries:
+	@SEQLOC=$(prefix)/bin/seq;\
+	if test -f "$$SEQLOC" && grep -q '\(^#!/.*/fish\|^#!/usr/bin/env fish\)' "$$SEQLOC"; then\
+		echo "An outdated seq from a previous fish install was found. You should remove it with:";\
+		echo "    rm '$$SEQLOC'";\
+	fi;
+	@SETCOLOR_LOC=$(prefix)/bin/set_color;\
+	if test -x "$$SETCOLOR_LOC" && $$SETCOLOR_LOC -v 2>&1 >/dev/null | grep -q "^set_color, version "; then\
+		echo "An outdated set_color from a previous fish install was found. You should remove it with:";\
+		echo "    rm '$$SETCOLOR_LOC'";\
+	fi;
+	@true;
+.PHONY: check-legacy-binaries
+
+
+#
+# This check makes sure that the install-sh script is executable. The
+# darcs repo doesn't preserve the executable bit, so this needs to be
+# run after checkout.
+#
+
+install-sh:
+	if test -x $@; then true; else chmod 755 $@; fi
+.PHONY: install-sh
+
+
+#
+# Try to install after checking for incompatible installed versions.
+#
+
+install: all install-sh check-uninstall install-force check-legacy-binaries
+.PHONY: install
+
+#
+# Xcode install
+#
+xcode-install:
+	rm -Rf /tmp/fish_build;\
+	xcodebuild install DSTROOT=/tmp/fish_build;\
+	ditto /tmp/fish_build /
+.PHONY: xcode-install
+
+#
+# Force installation, even in presense of incompatible previous
+# version. This may fail.
+# These 'true' lines are to prevent installs from failing for (e.g.) missing man pages.
+#
+
+install-force: all install-translations
+	$(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
+	for i in $(PROGRAMS); do\
+		$(INSTALL) -m 755 $$i $(DESTDIR)$(bindir) ; \
+		true ;\
+	done;
+	$(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)/fish
+	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish
+	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/completions
+	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/functions
+	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/man/man1
+	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/tools
+	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/tools/web_config
+	$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish/tools/web_config/sample_prompts
+	$(INSTALL) -m 644 etc/config.fish                  $(DESTDIR)$(sysconfdir)/fish/
+	$(INSTALL) -m 644 share/config.fish                $(DESTDIR)$(datadir)/fish/
+	for i in $(COMPLETIONS_DIR_FILES:%='%'); do \
+		$(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/fish/completions/; \
+		true; \
+	done;
+	for i in $(FUNCTIONS_DIR_FILES:%='%'); do \
+		$(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/fish/functions/; \
+		true; \
+	done;
+	for i in share/man/man1/*.1; do \
+		$(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/fish/man/man1/; \
+		true; \
+	done;
+	for i in share/tools/*.py; do\
+		$(INSTALL) -m 755 $$i $(DESTDIR)$(datadir)/fish/tools/; \
+		true; \
+	done;
+	for i in share/tools/web_config/*; do\
+		$(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/fish/tools/web_config/; \
+		true; \
+	done;
+	for i in share/tools/web_config/sample_prompts/*.fish; do\
+		$(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/fish/tools/web_config/sample_prompts/; \
+		true; \
+	done;
+	for i in share/tools/web_config/*.py; do\
+		$(INSTALL) -m 755 $$i $(DESTDIR)$(datadir)/fish/tools/web_config/; \
+		true; \
+	done;
+
+	$(INSTALL) -m 755 -d $(DESTDIR)$(docdir)
+	for i in user_doc/html/* ChangeLog; do \
+		if test -f $$i; then \
+			$(INSTALL) -m 644 $$i $(DESTDIR)$(docdir); \
+		fi; \
+	done;
+	$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
+	for i in $(MANUALS); do \
+		$(INSTALL) -m 644 $$i $(DESTDIR)$(mandir)/man1/; \
+		true; \
+	done;
+	@echo fish is now installed on your system.
+	@echo To run fish, type \'fish\' in your terminal.
+	@echo
+	@echo To use fish as your login shell:
+	@grep -q -- "$(DESTDIR)$(bindir)/fish" /etc/shells || echo \* add the line \'$(DESTDIR)$(bindir)/fish\' to the file \'/etc/shells\'.
+	@echo \* use the command \'chsh -s $(DESTDIR)$(bindir)/fish\'.
+	@echo
+	@echo To set your colors, run \'fish_config\'
+	@echo To scan your man pages for completions, run \'fish_update_completions\'
+	@echo To autocomplete command suggestions press Ctrl + F or right arrow key.
+	@echo
+	@echo Have fun!
+.PHONY: install-force
+
+
+#
+# Uninstall this fish version
+#
+
+uninstall: uninstall-translations
+	-for i in $(PROGRAMS); do \
+		rm -f $(DESTDIR)$(bindir)/$$i; \
+	done;
+	-rm -rf $(DESTDIR)$(sysconfdir)/fish
+	-if test -d $(DESTDIR)$(datadir)/fish; then \
+		rm -r $(DESTDIR)$(datadir)/fish; \
+	fi
+	-if test -d $(DESTDIR)$(docdir); then \
+		rm -rf $(DESTDIR)$(docdir);\
+	fi
+	-for i in $(MANUALS); do \
+		rm -rf $(DESTDIR)$(mandir)/man1/`basename $$i`*; \
+	done;
+.PHONY: uninstall
+
+
+#
+# Uninstall an older fish release. This is not the default uninstall
+# since there is a slight chance that it removes a file put in place by
+# the sysadmin. But if 'make install' detects a file confligt, it
+# suggests using this target.
+#
+
+uninstall-legacy: uninstall
+	-rm -f $(DESTDIR)$(sysconfdir)/fish.d/fish_interactive.fish
+	-rm -f $(DESTDIR)$(sysconfdir)/fish.d/fish_complete.fish
+	-rm -f $(DESTDIR)$(sysconfdir)/fish.d/fish_function.fish
+	-rm -f $(DESTDIR)$(sysconfdir)/fish/fish_inputrc
+	-if test -d $(DESTDIR)$(sysconfdir)/fish.d/completions; then \
+		for i in $(COMPLETIONS_DIR_FILES); do \
+			basename=`basename $$i`; \
+			if test -f $(DESTDIR)$(sysconfdir)/fish.d/completions/$$basename; then \
+				rm $(DESTDIR)$(sysconfdir)/fish.d/completions/$$basename; \
+			fi; \
+		done; \
+	fi;
+	-rmdir $(DESTDIR)$(sysconfdir)/fish.d/completions
+	-rmdir $(DESTDIR)$(sysconfdir)/fish.d
+	-rm $(DESTDIR)$(sysconfdir)/fish
+	@echo The previous fish installation has been removed.
+.PHONY: uninstall-legacy
+
+install-translations: $(TRANSLATIONS)
+	if test $(HAVE_GETTEXT) = 1; then \
+		for i in $(TRANSLATIONS); do \
+			$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/locale/`basename $$i .gmo`/LC_MESSAGES; \
+			$(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/locale/`basename $$i .gmo`/LC_MESSAGES/fish.mo; \
+			echo $(DESTDIR)$(datadir)/locale/`basename $$i .gmo`/LC_MESSAGES/fish.mo;\
+		done; \
+	fi;
+.PHONY: install-translations
+
+uninstall-translations:
+	if test $(HAVE_GETTEXT) = 1; then \
+		for i in $(TRANSLATIONS_SRC); do \
+			rm -f $(DESTDIR)$(datadir)/locale/*/LC_MESSAGES/fish.mo; \
+		done; \
+	fi
+.PHONY: uninstall-translations
+
+
+#
+# The build rules for all the commands
+#
+
+#
+# Build the fish program.
+#
+
+fish: $(FISH_OBJS) fish.o
+	$(CXX) $(FISH_OBJS) fish.o $(LDFLAGS_FISH) -o $@
+
+
+#
+# Build the fish_pager program.
+#
+
+fish_pager: $(FISH_PAGER_OBJS)
+	$(CXX) $(FISH_PAGER_OBJS) $(LDFLAGS_FISH_PAGER) -o $@
+
+
+#
+# Build the fishd program.
+#
+
+fishd: $(FISHD_OBJS)
+	$(CXX) $(FISHD_OBJS) $(LDFLAGS_FISHD) -o $@
+
+
+#
+# Build the fish_tests program.
+#
+
+fish_tests: $(FISH_TESTS_OBJS)
+	$(CXX) $(FISH_TESTS_OBJS) $(LDFLAGS_FISH) -o $@
+
+
+#
+# Build the mimedb program.
+#
+# mimedb does not need any libraries, so we don't use LDFLAGS here.
+#
+
+mimedb: $(MIME_OBJS)
+	$(CXX) $(MIME_OBJS) $(LDFLAGS_MIMEDB) -o $@
+
+
+#
+# Build the fish_indent program.
+#
+
+fish_indent: $(FISH_INDENT_OBJS)
+	$(CXX) $(FISH_INDENT_OBJS) $(LDFLAGS_FISH_INDENT) -o $@
+
+
+#
+# Neat little program to show output from terminal
+#
+
+key_reader: key_reader.o input_common.o common.o env_universal.o env_universal_common.o wutil.o iothread.o
+	$(CXX) key_reader.o input_common.o common.o env_universal.o env_universal_common.o wutil.o iothread.o $(LDFLAGS_FISH) -o $@
+
+
+#
+# Update dependencies
+#
+depend:
+	makedepend -fMakefile.in -Y *.cpp
+	./config.status
+.PHONY: depend
+
+#
+# Make compressed tar archives
+#
+
+fish-@PACKAGE_VERSION@.tar.gz: fish-@PACKAGE_VERSION@.tar
+	gzip -f --best -c fish-@PACKAGE_VERSION@.tar >fish-@PACKAGE_VERSION@.tar.gz
+
+fish-@PACKAGE_VERSION@.tar.bz2: fish-@PACKAGE_VERSION@.tar
+	bzip2 -f --best -k fish-@PACKAGE_VERSION@.tar
+
+dist: fish-@PACKAGE_VERSION@.tar.bz2
+.PHONY: dist
+
+#
+# Build the RPM spec file.
+#
+
+fish.spec: fish.spec.in
+	./config.status
+
+
+
+#
+# Create .rpm file for the current systems architecture and an
+# .src.rpm file.
+#
+
+rpm: fish-@PACKAGE_VERSION@.tar.bz2 fish.spec
+	@if which rpmbuild; then true; else \
+		echo Could not find the rpmbuild command, needed to build an rpm; \
+		echo You may be able to install it using the following command:; \
+		echo \'yum install rpm-build\'; \
+		false; \
+	fi
+	cp fish.spec /usr/src/redhat/SPECS/
+	cp fish-@PACKAGE_VERSION@.tar.bz2 /usr/src/redhat/SOURCES/
+	rpmbuild -ba --clean /usr/src/redhat/SPECS/fish.spec
+	mv /usr/src/redhat/RPMS/*/fish*@PACKAGE_VERSION@*.rpm .
+	mv /usr/src/redhat/SRPMS/fish*@PACKAGE_VERSION@*.src.rpm .
+.PHONY: rpm
+
+
+#
+# Cleanup targets
+#
+
+#
+# distclean should restore the tree to the state right after extracting a tarball.
+#
+
+distclean: clean
+	rm -f fish.spec
+	rm -f config.status config.log config.h Makefile
+.PHONY: distclean
+
+
+#
+# clean removes everything built by the makefile, but not things that
+# are created by the configure script.
+#
+
+# Don't delete the docs unless we have Doxygen installed
+# We provide pre-built docs in the tarball, and if they get
+# deleted we won't be able to regenerate them
+
+clean:
+	rm -f *.o doc.h doc.tmp doc_src/*.doxygen doc_src/*.cpp doc_src/*.o doc_src/commands.hdr
+	rm -f $(GENERATED_INTERN_SCRIPT_FILES)
+	rm -f tests/tmp.err tests/tmp.out tests/tmp.status tests/foo.txt
+	rm -f $(PROGRAMS) fish_tests key_reader
+	rm -f command_list.txt toc.txt
+	rm -f doc_src/index.hdr doc_src/commands.hdr
+	rm -f fish-@PACKAGE_VERSION@.tar
+	rm -f fish-@PACKAGE_VERSION@.tar.gz
+	rm -f fish-@PACKAGE_VERSION@.tar.bz2
+	if command -v doxygen; then \
+		rm -rf doc user_doc share/man; \
+	fi
+	rm -rf fish-@PACKAGE_VERSION@
+	rm -f $(TRANSLATIONS)
+.PHONY: clean
+
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
+autoload.o: config.h autoload.h common.h util.h lru.h wutil.h signal.h env.h
+autoload.o: exec.h proc.h io.h
+builtin.o: config.h signal.h fallback.h util.h wutil.h common.h builtin.h
+builtin.o: io.h function.h event.h complete.h proc.h parser.h reader.h env.h
+builtin.o: wgetopt.h sanity.h tokenizer.h wildcard.h expand.h input_common.h
+builtin.o: input.h intern.h exec.h highlight.h screen.h color.h parse_util.h
+builtin.o: autoload.h lru.h parser_keywords.h path.h history.h
+builtin.o: builtin_set.cpp builtin_commandline.cpp builtin_complete.cpp
+builtin.o: builtin_ulimit.cpp builtin_jobs.cpp builtin_printf.cpp
+builtin_commandline.o: config.h signal.h fallback.h util.h wutil.h common.h
+builtin_commandline.o: builtin.h io.h wgetopt.h reader.h complete.h proc.h
+builtin_commandline.o: parser.h event.h function.h tokenizer.h input_common.h
+builtin_commandline.o: input.h parse_util.h autoload.h lru.h
+builtin_complete.o: config.h signal.h fallback.h util.h wutil.h common.h
+builtin_complete.o: builtin.h io.h complete.h wgetopt.h parser.h proc.h
+builtin_complete.o: event.h function.h reader.h
+builtin_jobs.o: config.h fallback.h signal.h util.h wutil.h common.h
+builtin_jobs.o: builtin.h io.h proc.h parser.h event.h function.h wgetopt.h
+builtin_set.o: config.h signal.h fallback.h util.h wutil.h common.h builtin.h
+builtin_set.o: io.h env.h expand.h wgetopt.h proc.h parser.h event.h
+builtin_set.o: function.h
+builtin_test.o: config.h common.h util.h builtin.h io.h wutil.h proc.h
+builtin_test.o: signal.h
+builtin_ulimit.o: config.h fallback.h signal.h util.h builtin.h io.h common.h
+builtin_ulimit.o: wgetopt.h
+builtin_printf.o: wgetopt.h
+color.o: color.h config.h common.h util.h fallback.h signal.h
+common.o: config.h fallback.h signal.h util.h wutil.h common.h expand.h
+common.o: proc.h io.h wildcard.h parser.h event.h function.h complete.h
+common.o: util.cpp fallback.cpp
+complete.o: config.h signal.h fallback.h util.h tokenizer.h common.h
+complete.o: wildcard.h expand.h proc.h io.h parser.h event.h function.h
+complete.o: complete.h builtin.h env.h exec.h reader.h history.h wutil.h
+complete.o: intern.h parse_util.h autoload.h lru.h parser_keywords.h path.h
+env.o: config.h signal.h fallback.h util.h wutil.h common.h proc.h io.h env.h
+env.o: sanity.h expand.h history.h reader.h complete.h parser.h event.h
+env.o: function.h env_universal.h env_universal_common.h input.h
+env.o: input_common.h path.h
+env_universal.o: config.h signal.h fallback.h util.h common.h wutil.h
+env_universal.o: env_universal_common.h env_universal.h
+env_universal_common.o: config.h signal.h fallback.h util.h common.h wutil.h
+env_universal_common.o: env_universal_common.h
+event.o: config.h signal.h fallback.h util.h wutil.h common.h function.h
+event.o: event.h proc.h io.h parser.h
+exec.o: config.h signal.h fallback.h util.h iothread.h postfork.h common.h
+exec.o: proc.h io.h wutil.h exec.h parser.h event.h function.h builtin.h
+exec.o: env.h wildcard.h expand.h sanity.h parse_util.h autoload.h lru.h
+expand.o: config.h signal.h fallback.h util.h common.h wutil.h env.h proc.h
+expand.o: io.h parser.h event.h function.h expand.h wildcard.h exec.h
+expand.o: tokenizer.h complete.h parse_util.h autoload.h lru.h
+fallback.o: config.h fallback.h signal.h util.h
+fish.o: config.h signal.h fallback.h util.h common.h reader.h io.h complete.h
+fish.o: builtin.h function.h event.h wutil.h env.h sanity.h proc.h parser.h
+fish.o: expand.h intern.h exec.h output.h screen.h color.h history.h path.h
+fish_indent.o: config.h fallback.h signal.h util.h common.h wutil.h
+fish_indent.o: tokenizer.h print_help.h parser_keywords.h
+fish_pager.o: config.h signal.h fallback.h util.h wutil.h common.h complete.h
+fish_pager.o: output.h screen.h color.h input_common.h env_universal.h
+fish_pager.o: env_universal_common.h print_help.h
+fish_tests.o: config.h signal.h fallback.h util.h common.h proc.h io.h
+fish_tests.o: reader.h complete.h builtin.h function.h event.h autoload.h
+fish_tests.o: lru.h wutil.h env.h expand.h parser.h tokenizer.h output.h
+fish_tests.o: screen.h color.h exec.h path.h history.h highlight.h iothread.h
+fish_tests.o: postfork.h
+fishd.o: config.h signal.h fallback.h util.h common.h wutil.h
+fishd.o: env_universal_common.h path.h env.h print_help.h
+function.o: config.h signal.h wutil.h common.h util.h fallback.h function.h
+function.o: event.h proc.h io.h parser.h intern.h reader.h complete.h
+function.o: parse_util.h autoload.h lru.h parser_keywords.h env.h expand.h
+highlight.o: config.h signal.h fallback.h util.h wutil.h common.h highlight.h
+highlight.o: env.h screen.h color.h tokenizer.h proc.h io.h parser.h event.h
+highlight.o: function.h parse_util.h autoload.h lru.h parser_keywords.h
+highlight.o: builtin.h expand.h sanity.h complete.h output.h wildcard.h
+highlight.o: path.h history.h
+history.o: config.h fallback.h signal.h util.h sanity.h tokenizer.h common.h
+history.o: wutil.h history.h intern.h path.h env.h autoload.h lru.h
+history.o: iothread.h
+input.o: config.h signal.h fallback.h util.h wutil.h common.h reader.h io.h
+input.o: complete.h proc.h sanity.h input_common.h input.h parser.h event.h
+input.o: function.h env.h expand.h output.h screen.h color.h intern.h
+input_common.o: config.h fallback.h signal.h util.h common.h wutil.h
+input_common.o: input_common.h env_universal.h env_universal_common.h
+input_common.o: iothread.h
+intern.o: config.h fallback.h signal.h util.h wutil.h common.h intern.h
+io.o: config.h fallback.h signal.h util.h wutil.h common.h exec.h proc.h io.h
+iothread.o: config.h iothread.h common.h util.h signal.h
+key_reader.o: config.h common.h util.h fallback.h signal.h input_common.h
+kill.o: config.h signal.h fallback.h util.h wutil.h common.h kill.h proc.h
+kill.o: io.h sanity.h env.h exec.h path.h
+mimedb.o: config.h xdgmime.h fallback.h signal.h util.h print_help.h
+output.o: config.h signal.h fallback.h util.h wutil.h common.h expand.h
+output.o: output.h screen.h color.h highlight.h env.h
+parse_util.o: config.h fallback.h signal.h util.h wutil.h common.h
+parse_util.o: tokenizer.h parse_util.h autoload.h lru.h expand.h intern.h
+parse_util.o: exec.h proc.h io.h env.h wildcard.h
+parser.o: config.h signal.h fallback.h util.h common.h wutil.h proc.h io.h
+parser.o: parser.h event.h function.h parser_keywords.h tokenizer.h exec.h
+parser.o: wildcard.h expand.h builtin.h env.h reader.h complete.h sanity.h
+parser.o: env_universal.h env_universal_common.h intern.h parse_util.h
+parser.o: autoload.h lru.h path.h
+parser_keywords.o: config.h fallback.h signal.h common.h util.h
+parser_keywords.o: parser_keywords.h
+path.o: config.h fallback.h signal.h util.h common.h env.h wutil.h path.h
+path.o: expand.h
+postfork.o: signal.h postfork.h config.h common.h util.h proc.h io.h wutil.h
+postfork.o: iothread.h exec.h
+print_help.o: print_help.h
+proc.o: config.h signal.h fallback.h util.h wutil.h common.h proc.h io.h
+proc.o: reader.h complete.h sanity.h env.h parser.h event.h function.h
+proc.o: output.h screen.h color.h
+reader.o: config.h signal.h fallback.h util.h wutil.h common.h highlight.h
+reader.o: env.h screen.h color.h reader.h io.h complete.h proc.h parser.h
+reader.o: event.h function.h history.h sanity.h exec.h expand.h tokenizer.h
+reader.o: kill.h input_common.h input.h output.h iothread.h intern.h path.h
+reader.o: parse_util.h autoload.h lru.h
+sanity.o: config.h signal.h fallback.h util.h common.h sanity.h proc.h io.h
+sanity.o: history.h wutil.h reader.h complete.h kill.h
+screen.o: config.h fallback.h signal.h common.h util.h wutil.h output.h
+screen.o: screen.h color.h highlight.h env.h
+signal.o: config.h signal.h common.h util.h fallback.h wutil.h event.h
+signal.o: reader.h io.h complete.h proc.h
+tokenizer.o: config.h fallback.h signal.h util.h wutil.h common.h tokenizer.h
+util.o: config.h fallback.h signal.h util.h common.h wutil.h
+wgetopt.o: config.h wgetopt.h wutil.h common.h util.h fallback.h signal.h
+wildcard.o: config.h fallback.h signal.h util.h wutil.h common.h complete.h
+wildcard.o: wildcard.h expand.h reader.h io.h exec.h proc.h
+wutil.o: config.h fallback.h signal.h util.h common.h wutil.h
+xdgmime.o: xdgmime.h xdgmimeint.h xdgmimeglob.h xdgmimemagic.h xdgmimealias.h
+xdgmime.o: xdgmimeparent.h
+xdgmimealias.o: xdgmimealias.h xdgmime.h xdgmimeint.h
+xdgmimeglob.o: xdgmimeglob.h xdgmime.h xdgmimeint.h
+xdgmimeint.o: xdgmimeint.h xdgmime.h
+xdgmimemagic.o: xdgmimemagic.h xdgmime.h xdgmimeint.h
+xdgmimeparent.o: xdgmimeparent.h xdgmime.h xdgmimeint.h

README.md

@@ -0,0 +1,71 @@
+[fish](http://ridiculousfish.com/shell/) - the friendly interactive 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://ridiculousfish.com/shell/user_doc/html/design.html).
+
+## Quick Start
+
+fish generally works like other shells, like bash or zsh. A few important differences are documented at <http://ridiculousfish.com/shell/faq.html>
+
+Detailed user documentation is available by running `help` within fish, and also at <http://ridiculousfish.com/shell/user_doc/html/>
+
+## Building
+
+fish is written in a sane subset of C++98, with a few components from C++TR1. It builds successfully with g++ 4.2 or later, and with clang. It also will build as C++11.
+
+fish can be built using autotools or Xcode.
+
+### Autotools Build
+
+    autoconf
+    ./configure
+    make [gmake on BSD]
+    sudo make install
+
+### Xcode Development Build
+
+* Build the `base` target in Xcode
+* Run the fish executable, for example, in `DerivedData/fish/Build/Products/Debug/base/bin/fish`
+
+### Xcode Build and Install
+
+    xcodebuild install
+    sudo ditto /tmp/fish.dst /
+
+## Help, it didn't build!
+
+If fish reports that it could not find curses, try installing a curses development package and build again.
+
+On Debian or Ubuntu you want:
+
+	sudo apt-get install libncurses5-dev libncursesw5-dev
+
+on RedHat, CentOS, or Amazon EC2:
+
+    sudo yum install ncurses-devel
+
+## Packages for Linux
+
+Nightly builds for several Linux distros can be downloaded from <http://download.opensuse.org/repositories/home:/siteshwar/>
+
+## Switching to fish
+
+If you wish to use fish as your default shell, use the following command:
+
+	chsh -s /usr/local/bin/fish
+
+chsh will prompt you for your password, and change your default shell.
+
+To switch your default shell back, you can run:
+
+	chsh -s /bin/bash
+
+Substitute /bin/bash with /bin/tcsh or /bin/zsh as appropriate.
+
+## Contact Us
+
+Questions, comments, rants and raves can be posted to the official fish mailing list at <https://lists.sourceforge.net/lists/listinfo/fish-users> or join us on our IRC channel #fish at irc.oftc.net
+
+Found a bug? Have an awesome idea? Please open an issue on this github page.

README.rst

@@ -1,225 +0,0 @@
-.. |Cirrus CI| image:: https://api.cirrus-ci.com/github/fish-shell/fish-shell.svg?branch=master
-      :target: https://cirrus-ci.com/github/fish-shell/fish-shell
-      :alt: Cirrus CI Build Status
-
-`fish <https://fishshell.com/>`__ - the friendly interactive shell |Build Status| |Cirrus CI|
-=============================================================================================
-
-fish is a smart and user-friendly command line shell for macOS, 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 downloads, screenshots and more, go to https://fishshell.com/.
-
-Quick Start
------------
-
-fish generally works like other shells, like bash or zsh. A few
-important differences can be found at
-https://fishshell.com/docs/current/tutorial.html by searching for the
-magic phrase “unlike other shells”.
-
-Detailed user documentation is available by running ``help`` within
-fish, and also at https://fishshell.com/docs/current/index.html
-
-Getting fish
-------------
-
-macOS
-~~~~~
-
-fish can be installed:
-
--  using `Homebrew <http://brew.sh/>`__: ``brew install fish``
--  using `MacPorts <https://www.macports.org/>`__:
-   ``sudo port install fish``
--  using the `installer from fishshell.com <https://fishshell.com/>`__
--  as a `standalone app from fishshell.com <https://fishshell.com/>`__
-
-Note: The minimum supported macOS version is 10.12.
-
-Packages for Linux
-~~~~~~~~~~~~~~~~~~
-
-Packages for Debian, Fedora, openSUSE, and Red Hat Enterprise
-Linux/CentOS are available from the `openSUSE Build
-Service <https://software.opensuse.org/download.html?project=shells%3Afish&package=fish>`__.
-
-Packages for Ubuntu are available from the `fish
-PPA <https://launchpad.net/~fish-shell/+archive/ubuntu/release-4>`__,
-and can be installed using the following commands:
-
-::
-
-   sudo apt-add-repository ppa:fish-shell/release-4
-   sudo apt update
-   sudo apt install fish
-
-Instructions for other distributions may be found at
-`fishshell.com <https://fishshell.com>`__.
-
-Windows
-~~~~~~~
-
--  On Windows 10/11, fish can be installed under the WSL Windows Subsystem
-   for Linux with the instructions for the appropriate distribution
-   listed above under “Packages for Linux”, or from source with the
-   instructions below.
--  Fish can also be installed on all versions of Windows using
-   `Cygwin <https://cygwin.com/>`__ or `MSYS2 <https://github.com/Berrysoft/fish-msys2>`__.
-
-Building from source
-~~~~~~~~~~~~~~~~~~~~
-
-If packages are not available for your platform, GPG-signed tarballs are
-available from `fishshell.com <https://fishshell.com/>`__ and
-`fish-shell on
-GitHub <https://github.com/fish-shell/fish-shell/releases>`__. See the
-`Building <#building>`_ section for instructions.
-
-Running fish
-------------
-
-Once installed, run ``fish`` from your current shell to try fish out!
-
-Dependencies
-~~~~~~~~~~~~
-
-Running fish requires:
-
--  some common \*nix system utilities (currently ``mktemp``), in
-   addition to the basic POSIX utilities (``cat``, ``cut``, ``dirname``,
-   ``ls``, ``mkdir``, ``mkfifo``, ``rm``, ``sh``, ``sort``, ``tee``, ``tr``,
-   ``uname`` and ``sed`` at least, but the full coreutils plus ``find`` and
-   ``awk`` is preferred)
-
-The following optional features also have specific requirements:
-
--  builtin commands that have the ``--help`` option or print usage
-   messages require ``man`` for display
--  automated completion generation from manual pages requires Python 3.5+
--  the ``fish_config`` web configuration tool requires Python 3.5+ and a web browser
--  the :ref:`alt-o <shared-binds-alt-o>` binding requires the ``file`` program.
--  system clipboard integration (with the default Ctrl-V and Ctrl-X
-   bindings) require either the ``xsel``, ``xclip``,
-   ``wl-copy``/``wl-paste`` or ``pbcopy``/``pbpaste`` utilities
--  full completions for ``yarn`` and ``npm`` require the
-   ``all-the-package-names`` NPM module
--  ``colorls`` is used, if installed, to add color when running ``ls`` on platforms
-   that do not have color support (such as OpenBSD)
-
-Building
---------
-
-Dependencies
-~~~~~~~~~~~~
-
-Compiling fish requires:
-
--  Rust (version 1.85 or later), including cargo
--  CMake (version 3.15 or later)
--  a C compiler (for system feature detection and the test helper binary)
--  PCRE2 (headers and libraries) - optional, this will be downloaded if missing
--  gettext (only the msgfmt tool) - optional, for translation support
--  an Internet connection, as other dependencies will be downloaded automatically
-
-Sphinx is also optionally required to build the documentation from a
-cloned git repository.
-
-Additionally, running the full test suite requires diff, git, Python 3.5+, pexpect, less, tmux and wget.
-
-Building from source with CMake
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Rather than building from source, consider using a packaged build for your platform. Using the
-steps below makes fish difficult to uninstall or upgrade. Release packages are available from the
-links above, and up-to-date `development builds of fish are available for many platforms
-<https://github.com/fish-shell/fish-shell/wiki/Development-builds>`__
-
-To install into ``/usr/local``, run:
-
-.. code:: shell
-
-   mkdir build; cd build
-   cmake ..
-   cmake --build .
-   sudo cmake --install .
-
-The install directory can be changed using the
-``-DCMAKE_INSTALL_PREFIX`` parameter for ``cmake``.
-
-CMake Build options
-~~~~~~~~~~~~~~~~~~~
-
-In addition to the normal CMake build options (like ``CMAKE_INSTALL_PREFIX``), fish's CMake build has some other options available to customize it.
-
-- Rust_COMPILER=path - the path to rustc. If not set, cmake will check $PATH and ~/.cargo/bin
-- Rust_CARGO=path - the path to cargo. If not set, cmake will check $PATH and ~/.cargo/bin
-- Rust_CARGO_TARGET=target - the target to pass to cargo. Set this for cross-compilation.
-- WITH_DOCS=ON|OFF - whether to build the documentation. By default, this is ON when Sphinx is installed.
-- FISH_INDENT_FOR_BUILDING_DOCS - useful for cross-compilation.
-  Set this to the path to the ``fish_indent`` executable to use for building HTML docs.
-  By default, ``${CMAKE_BINARY_DIR}/fish_indent`` will be used.
-  If that's not runnable on the compile host,
-  you can build a native one with ``cargo build --bin fish_indent`` and set this to ``$PWD/target/debug/fish_indent``.
-- FISH_USE_SYSTEM_PCRE2=ON|OFF - whether to use an installed pcre2. This is normally autodetected.
-- WITH_GETTEXT=ON|OFF - whether to include translations.
-- extra_functionsdir, extra_completionsdir and extra_confdir - to compile in an additional directory to be searched for functions, completions and configuration snippets
-
-Building fish with Cargo
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-You can also build fish with Cargo.
-This example uses `uv <https://github.com/astral-sh/uv>`__ to install Sphinx (which is used for man-pages and ``--help`` options).
-You can also install Sphinx another way and drop the ``uv run --no-managed-python`` prefix.
-
-.. code:: shell
-
-    git clone https://github.com/fish-shell/fish-shell
-    cd fish-shell
-
-    # Optional: check out a specific version rather than building the latest
-    # development version.
-    git checkout "$(git for-each-ref refs/tags/ | awk '$2 == "tag" { print $3 }' | tail -1)"
-
-    uv run --no-managed-python \
-        cargo install --path .
-
-This will place standalone binaries in ``~/.cargo/bin/``, but you can move them wherever you want.
-
-To disable translations, disable the ``localize-messages`` feature by passing ``--no-default-features --features=embed-manpages`` to cargo.
-
-You can also link this build statically (but not against glibc) and move it to other computers.
-
-Here are the remaining advantages of a full installation, as currently done by CMake:
-
-- Man pages like ``fish(1)`` installed in standard locations, easily accessible from outside fish.
-- Separate files for builtins (e.g. ``$PREFIX/share/fish/man/man1/abbr.1``).
-- A local copy of the HTML documentation, typically accessed via the ``help`` fish function.
-  In Cargo builds, ``help`` will redirect to `<https://fishshell.com/docs/current/>`__
-- Ability to use our CMake options extra_functionsdir, extra_completionsdir and extra_confdir,
-  (also recorded in ``$PREFIX/share/pkgconfig/fish.pc``)
-  which are used by some package managers to house third-party completions.
-  Regardless of build system, fish uses ``$XDG_DATA_DIRS/{vendor_completion.d,vendor_conf.d,vendor_functions.d}``.
-
-Contributing Changes to the Code
---------------------------------
-
-See the `Guide for Developers <CONTRIBUTING.rst>`__.
-
-Contact Us
-----------
-
-Questions, comments, rants and raves can be posted to the official fish
-mailing list at https://lists.sourceforge.net/lists/listinfo/fish-users
-or join us on our `matrix
-channel <https://matrix.to/#/#fish-shell:matrix.org>`__. Or use the `fish tag
-on Unix & Linux Stackexchange <https://unix.stackexchange.com/questions/tagged/fish>`__.
-There is also a fish tag on Stackoverflow, but it is typically a poor fit.
-
-Found a bug? Have an awesome idea? Please `open an
-issue <https://github.com/fish-shell/fish-shell/issues/new>`__.
-
-.. |Build Status| image:: https://github.com/fish-shell/fish-shell/workflows/make%20test/badge.svg
-   :target: https://github.com/fish-shell/fish-shell/actions

SECURITY.md

@@ -1,35 +0,0 @@
-# Security Reporting
-
-If you wish to report a security vulnerability privately, we appreciate your diligence. Please follow the guidelines below to submit your report.
-
-## Reporting
-
-To report a security vulnerability, please provide the following information:
-
-1. **PROJECT**
-
-    - Include the URL of the project repository - Example: <https://github.com/fish-shell/fish-shell>
-
-2. **PUBLIC**
-
-    - Indicate whether this vulnerability has already been publicly discussed or disclosed.
-    - If so, provide relevant links.
-
-3. **DESCRIPTION**
-    - Provide a detailed description of the security vulnerability.
-    - Include as much information as possible to help us understand and address the issue.
-
-Send this information, along with any additional relevant details, to <rf@fishshell.com>.
-
-## Confidentiality
-
-We kindly ask you to keep the report confidential until a public announcement is made.
-
-## Notes
-
--   Vulnerabilities will be handled on a best-effort basis.
--   You may request an advance copy of the patched release, but we cannot guarantee early access before the public release.
--   You will be notified via email simultaneously with the public announcement.
--   We will respond within a few weeks to confirm whether your report has been accepted or rejected.
-
-Thank you for helping to improve the security of our project!

STYLEGUIDE.md

@@ -0,0 +1,105 @@
+# Style guide
+
+This is style guide for fish contributors. You should use it for any new code
+that you would add to this project and try to format existing code to use this
+style.
+
+## Formatting
+
+1. fish uses the Allman/BSD style of indentation.
+2. Indent with spaces, not tabs.
+3. Use 4 spaces per indent (unless needed like `Makefile`).
+4. Opening curly bracket is on the following line:
+
+        // ✔:
+        struct name
+        {
+          // code
+        };
+
+        void func()
+        {
+          // code
+        }
+
+        if (...)
+        {
+          // code
+        }
+
+        // ✗:
+        void func() {
+          // code
+        }
+
+5. Put space after `if`, `while` and `for` before conditions.
+
+        // ✔:
+        if () {}
+
+        // ✗:
+        if() {}
+
+6. Put spaces before and after operators excluding increment and decrement;
+
+        // ✔:
+        int a = 1 + 2 * 3;
+        a++;
+
+        // ✗:
+        int a=1+2*3;
+        a ++;
+
+7. Never put spaces between function name and parameters list.
+
+        // ✔:
+        func(args);
+
+        // ✗:
+        func (args);
+
+8. Never put spaces after `(` and before `)`.
+9. Always put space after comma and semicolon.
+
+        // ✔:
+        func(arg1, arg2);
+
+        for (int i = 0; i < LENGTH; i++) {}
+
+        // ✗:
+        func(arg1,arg2);
+
+        for (int i = 0;i<LENGTH;i++) {}
+
+## Documentation
+
+Document your code using [Doxygen][dox].
+
+1. Documentation comment should use double star notation or tripple slash:
+
+        // ✔:
+        /// Some var
+        int var;
+
+        /**
+         * Some func
+         */
+        void func();
+
+2. Use slash as tag mark:
+
+        // ✔:
+
+        /**
+         * \param a an integer argument.
+         * \param s a constant character pointer.
+         * \return The results
+         */
+        int foo(int a, const char *s);
+
+## Naming
+
+All names in code should be `small_snake_case`. No Hungarian notation is used.
+Classes and structs names should be followed by `_t`.
+
+[dox]: http://www.stack.nl/~dimitri/doxygen/ "Doxygen homepage"

autoload.cpp

@@ -0,0 +1,376 @@
+/** \file autoload.cpp
+
+The classes responsible for autoloading functions and completions.
+*/
+
+#include "config.h"
+#include "autoload.h"
+#include "wutil.h"
+#include "common.h"
+#include "signal.h"
+#include "env.h"
+#include "exec.h"
+#include <assert.h>
+#include <algorithm>
+
+/* The time before we'll recheck an autoloaded file */
+static const int kAutoloadStalenessInterval = 15;
+
+file_access_attempt_t access_file(const wcstring &path, int mode)
+{
+    //printf("Touch %ls\n", path.c_str());
+    file_access_attempt_t result = {0};
+    struct stat statbuf;
+    if (wstat(path, &statbuf))
+    {
+        result.error = errno;
+    }
+    else
+    {
+        result.mod_time = statbuf.st_mtime;
+        if (waccess(path, mode))
+        {
+            result.error = errno;
+        }
+        else
+        {
+            result.accessible = true;
+        }
+    }
+
+    // Note that we record the last checked time after the call, on the assumption that in a slow filesystem, the lag comes before the kernel check, not after.
+    result.stale = false;
+    result.last_checked = time(NULL);
+    return result;
+}
+
+autoload_t::autoload_t(const wcstring &env_var_name_var, const builtin_script_t * const scripts, size_t script_count) :
+    lock(),
+    env_var_name(env_var_name_var),
+    builtin_scripts(scripts),
+    builtin_script_count(script_count),
+    last_path(),
+    is_loading_set()
+{
+    pthread_mutex_init(&lock, NULL);
+}
+
+autoload_t::~autoload_t()
+{
+    pthread_mutex_destroy(&lock);
+}
+
+void autoload_t::node_was_evicted(autoload_function_t *node)
+{
+    // This should only ever happen on the main thread
+    ASSERT_IS_MAIN_THREAD();
+
+    // Tell ourselves that the command was removed if it was loaded
+    if (! node->is_loaded)
+        this->command_removed(node->key);
+    delete node;
+}
+
+int autoload_t::unload(const wcstring &cmd)
+{
+    return this->evict_node(cmd);
+}
+
+int autoload_t::load(const wcstring &cmd, bool reload)
+{
+    int res;
+    CHECK_BLOCK(0);
+    ASSERT_IS_MAIN_THREAD();
+
+    env_var_t path_var = env_get_string(env_var_name);
+
+    /*
+      Do we know where to look?
+    */
+    if (path_var.empty())
+        return 0;
+
+    /* Check if the lookup path has changed. If so, drop all loaded files. path_var may only be inspected on the main thread. */
+    if (path_var != this->last_path)
+    {
+        this->last_path = path_var;
+        scoped_lock locker(lock);
+        this->evict_all_nodes();
+    }
+
+    /** Warn and fail on infinite recursion. It's OK to do this because this function is only called on the main thread. */
+    if (this->is_loading(cmd))
+    {
+        debug(0,
+              _(L"Could not autoload item '%ls', it is already being autoloaded. "
+                L"This is a circular dependency in the autoloading scripts, please remove it."),
+              cmd.c_str());
+        return 1;
+    }
+
+    /* Mark that we're loading this */
+    is_loading_set.insert(cmd);
+
+    /* Get the list of paths from which we will try to load */
+    std::vector<wcstring> path_list;
+    tokenize_variable_array(path_var, path_list);
+
+    /* Try loading it */
+    res = this->locate_file_and_maybe_load_it(cmd, true, reload, path_list);
+
+    /* Clean up */
+    bool erased = !! is_loading_set.erase(cmd);
+    assert(erased);
+
+    return res;
+}
+
+bool autoload_t::can_load(const wcstring &cmd, const env_vars_snapshot_t &vars)
+{
+    const env_var_t path_var = vars.get(env_var_name);
+    if (path_var.missing_or_empty())
+        return false;
+
+    std::vector<wcstring> path_list;
+    tokenize_variable_array(path_var, path_list);
+    return this->locate_file_and_maybe_load_it(cmd, false, false, path_list);
+}
+
+static bool script_name_precedes_script_name(const builtin_script_t &script1, const builtin_script_t &script2)
+{
+    return wcscmp(script1.name, script2.name) < 0;
+}
+
+void autoload_t::unload_all(void)
+{
+    scoped_lock locker(lock);
+    this->evict_all_nodes();
+}
+
+/** Check whether the given command is loaded. */
+bool autoload_t::has_tried_loading(const wcstring &cmd)
+{
+    scoped_lock locker(lock);
+    autoload_function_t * func = this->get_node(cmd);
+    return func != NULL;
+}
+
+static bool is_stale(const autoload_function_t *func)
+{
+    /** Return whether this function is stale. Internalized functions can never be stale. */
+    return ! func->is_internalized && time(NULL) - func->access.last_checked > kAutoloadStalenessInterval;
+}
+
+autoload_function_t *autoload_t::get_autoloaded_function_with_creation(const wcstring &cmd, bool allow_eviction)
+{
+    ASSERT_IS_LOCKED(lock);
+    autoload_function_t *func = this->get_node(cmd);
+    if (! func)
+    {
+        func = new autoload_function_t(cmd);
+        if (allow_eviction)
+        {
+            this->add_node(func);
+        }
+        else
+        {
+            this->add_node_without_eviction(func);
+        }
+    }
+    return func;
+}
+
+/**
+   This internal helper function does all the real work. By using two
+   functions, the internal function can return on various places in
+   the code, and the caller can take care of various cleanup work.
+
+     cmd: the command name ('grep')
+     really_load: whether to actually parse it as a function, or just check it it exists
+     reload: whether to reload it if it's already loaded
+     path_list: the set of paths to check
+
+     Result: if really_load is true, returns whether the function was loaded. Otherwise returns whether the function existed.
+*/
+bool autoload_t::locate_file_and_maybe_load_it(const wcstring &cmd, bool really_load, bool reload, const wcstring_list_t &path_list)
+{
+    /* Note that we are NOT locked in this function! */
+    size_t i;
+    bool reloaded = 0;
+
+    /* Try using a cached function. If we really want the function to be loaded, require that it be really loaded. If we're not reloading, allow stale functions. */
+    {
+        bool allow_stale_functions = ! reload;
+
+        /* Take a lock */
+        scoped_lock locker(lock);
+
+        /* Get the function */
+        autoload_function_t * func = this->get_node(cmd);
+
+        /* Determine if we can use this cached function */
+        bool use_cached;
+        if (! func)
+        {
+            /* Can't use a function that doesn't exist */
+            use_cached = false;
+        }
+        else if (really_load && ! func->is_placeholder && ! func->is_loaded)
+        {
+            /* Can't use an unloaded function */
+            use_cached = false;
+        }
+        else if (! allow_stale_functions && is_stale(func))
+        {
+            /* Can't use a stale function */
+            use_cached = false;
+        }
+        else
+        {
+            /* I guess we can use it */
+            use_cached = true;
+        }
+
+        /* If we can use this function, return whether we were able to access it */
+        if (use_cached)
+        {
+            return func->is_internalized || func->access.accessible;
+        }
+    }
+    /* The source of the script will end up here */
+    wcstring script_source;
+    bool has_script_source = false;
+
+    /* Whether we found an accessible file */
+    bool found_file = false;
+
+    /* Look for built-in scripts via a binary search */
+    const builtin_script_t *matching_builtin_script = NULL;
+    if (builtin_script_count > 0)
+    {
+        const builtin_script_t test_script = {cmd.c_str(), NULL};
+        const builtin_script_t *array_end = builtin_scripts + builtin_script_count;
+        const builtin_script_t *found = std::lower_bound(builtin_scripts, array_end, test_script, script_name_precedes_script_name);
+        if (found != array_end && ! wcscmp(found->name, test_script.name))
+        {
+            /* We found it */
+            matching_builtin_script = found;
+        }
+    }
+    if (matching_builtin_script)
+    {
+        has_script_source = true;
+        script_source = str2wcstring(matching_builtin_script->def);
+
+        /* Make a node representing this function */
+        scoped_lock locker(lock);
+        autoload_function_t *func = this->get_autoloaded_function_with_creation(cmd, really_load);
+
+        /* This function is internalized */
+        func->is_internalized = true;
+
+        /* It's a fiction to say the script is loaded at this point, but we're definitely going to load it down below. */
+        if (really_load) func->is_loaded = true;
+    }
+
+    if (! has_script_source)
+    {
+        /* Iterate over path searching for suitable completion files */
+        for (i=0; i<path_list.size(); i++)
+        {
+            wcstring next = path_list.at(i);
+            wcstring path = next + L"/" + cmd + L".fish";
+
+            const file_access_attempt_t access = access_file(path, R_OK);
+            if (access.accessible)
+            {
+                /* Found it! */
+                found_file = true;
+
+                /* Now we're actually going to take the lock. */
+                scoped_lock locker(lock);
+                autoload_function_t *func = this->get_node(cmd);
+
+                /* Generate the source if we need to load it */
+                bool need_to_load_function = really_load && (func == NULL || func->access.mod_time != access.mod_time || ! func->is_loaded);
+                if (need_to_load_function)
+                {
+
+                    /* Generate the script source */
+                    wcstring esc = escape_string(path, 1);
+                    script_source = L". " + esc;
+                    has_script_source = true;
+
+                    /* Remove any loaded command because we are going to reload it. Note that this will deadlock if command_removed calls back into us. */
+                    if (func && func->is_loaded)
+                    {
+                        command_removed(cmd);
+                        func->is_placeholder = false;
+                    }
+
+                    /* Mark that we're reloading it */
+                    reloaded = true;
+                }
+
+                /* Create the function if we haven't yet. This does not load it. Do not trigger eviction unless we are actually loading, because we don't want to evict off of the main thread. */
+                if (! func)
+                {
+                    func = get_autoloaded_function_with_creation(cmd, really_load);
+                }
+
+                /* It's a fiction to say the script is loaded at this point, but we're definitely going to load it down below. */
+                if (need_to_load_function) func->is_loaded = true;
+
+                /* Unconditionally record our access time */
+                func->access = access;
+
+                break;
+            }
+        }
+
+        /*
+          If no file or builtin script was found we insert a placeholder function.
+          Later we only research if the current time is at least five seconds later.
+          This way, the files won't be searched over and over again.
+        */
+        if (! found_file && ! has_script_source)
+        {
+            scoped_lock locker(lock);
+            /* Generate a placeholder */
+            autoload_function_t *func = this->get_node(cmd);
+            if (! func)
+            {
+                func = new autoload_function_t(cmd);
+                func->is_placeholder = true;
+                if (really_load)
+                {
+                    this->add_node(func);
+                }
+                else
+                {
+                    this->add_node_without_eviction(func);
+                }
+            }
+            func->access.last_checked = time(NULL);
+        }
+    }
+
+    /* If we have a script, either built-in or a file source, then run it */
+    if (really_load && has_script_source)
+    {
+        if (exec_subshell(script_source, false /* do not apply exit status */) == -1)
+        {
+            /* Do nothing on failure */
+        }
+
+    }
+
+    if (really_load)
+    {
+        return reloaded;
+    }
+    else
+    {
+        return found_file || has_script_source;
+    }
+}

autoload.h

@@ -0,0 +1,138 @@
+/** \file autoload.h
+
+    The classes responsible for autoloading functions and completions.
+*/
+
+#ifndef FISH_AUTOLOAD_H
+#define FISH_AUTOLOAD_H
+
+#include <wchar.h>
+#include <map>
+#include <set>
+#include <list>
+#include "common.h"
+#include "lru.h"
+
+/** A struct responsible for recording an attempt to access a file. */
+struct file_access_attempt_t
+{
+    time_t mod_time; /** The modification time of the file */
+    time_t last_checked; /** When we last checked the file */
+    bool accessible; /** Whether we believe we could access this file */
+    bool stale; /** Whether the access attempt is stale */
+    int error; /** If we could not access the file, the error code */
+};
+
+file_access_attempt_t access_file(const wcstring &path, int mode);
+
+struct autoload_function_t : public lru_node_t
+{
+    autoload_function_t(const wcstring &key) : lru_node_t(key), access(), is_loaded(false), is_placeholder(false), is_internalized(false) { }
+    file_access_attempt_t access; /** The last access attempt */
+    bool is_loaded; /** Whether we have actually loaded this function */
+    bool is_placeholder; /** Whether we are a placeholder that stands in for "no such function". If this is true, then is_loaded must be false. */
+    bool is_internalized; /** Whether this function came from a builtin "internalized" script */
+};
+
+struct builtin_script_t
+{
+    const wchar_t *name;
+    const char *def;
+};
+
+struct builtin_script_t;
+class env_vars_snapshot_t;
+
+/**
+  A class that represents a path from which we can autoload, and the autoloaded contents.
+ */
+class autoload_t : private lru_cache_t<autoload_function_t>
+{
+private:
+
+    /** Lock for thread safety */
+    pthread_mutex_t lock;
+
+    /** The environment variable name */
+    const wcstring env_var_name;
+
+    /** Builtin script array */
+    const struct builtin_script_t *const builtin_scripts;
+
+    /** Builtin script count */
+    const size_t builtin_script_count;
+
+    /** The path from which we most recently autoloaded */
+    wcstring last_path;
+
+    /**
+       A table containing all the files that are currently being
+       loaded. This is here to help prevent recursion.
+    */
+    std::set<wcstring> is_loading_set;
+
+    bool is_loading(const wcstring &name) const
+    {
+        return is_loading_set.find(name) != is_loading_set.end();
+    }
+
+    void remove_all_functions(void)
+    {
+        this->evict_all_nodes();
+    }
+
+    bool locate_file_and_maybe_load_it(const wcstring &cmd, bool really_load, bool reload, const wcstring_list_t &path_list);
+
+    virtual void node_was_evicted(autoload_function_t *node);
+
+    autoload_function_t *get_autoloaded_function_with_creation(const wcstring &cmd, bool allow_eviction);
+
+protected:
+    /** Overridable callback for when a command is removed */
+    virtual void command_removed(const wcstring &cmd) { }
+
+public:
+
+    /** Create an autoload_t for the given environment variable name */
+    autoload_t(const wcstring &env_var_name_var, const builtin_script_t *scripts, size_t script_count);
+
+    /** Destructor */
+    virtual ~autoload_t();
+
+    /**
+       Autoload the specified file, if it exists in the specified path. Do
+       not load it multiple times unless its timestamp changes or
+       parse_util_unload is called.
+
+       Autoloading one file may unload another.
+
+       \param cmd the filename to search for. The suffix '.fish' is always added to this name
+       \param on_unload a callback function to run if a suitable file is found, which has not already been run. unload will also be called for old files which are unloaded.
+       \param reload wheter to recheck file timestamps on already loaded files
+    */
+    int load(const wcstring &cmd, bool reload);
+
+    /** Check whether we have tried loading the given command. Does not do any I/O. */
+    bool has_tried_loading(const wcstring &cmd);
+
+    /**
+       Tell the autoloader that the specified file, in the specified path,
+       is no longer loaded.
+
+       \param cmd the filename to search for. The suffix '.fish' is always added to this name
+       \param on_unload a callback function which will be called before (re)loading a file, may be used to unload the previous file.
+       \return non-zero if the file was removed, zero if the file had not yet been loaded
+    */
+    int unload(const wcstring &cmd);
+
+    /**
+       Unloads all files.
+    */
+    void unload_all();
+
+    /** Check whether the given command could be loaded, but do not load it. */
+    bool can_load(const wcstring &cmd, const env_vars_snapshot_t &vars);
+
+};
+
+#endif

benchmarks/benchmarks/external_cmds.fish

@@ -1,3 +0,0 @@
-for i in (seq 1000)
-    command true
-end

benchmarks/benchmarks/glob.fish

@@ -1,7 +0,0 @@
-# Glob fish's source directory.
-# This timing is bound to change if the repo does,
-# so it's best to build two fishes, check out one version of the repo,
-# and then run this script with both.
-set -l dir (dirname (status current-filename))
-# No repetitions, this is plenty slow enough.
-echo $dir/../../**

benchmarks/benchmarks/load_completions.fish

@@ -1,11 +0,0 @@
-set -l compdir (status dirname)/../../share/completions
-cd $compdir
-for file in *.fish
-    set -l bname (string replace -r '.fish$' '' -- $file)
-    if type -q $bname
-        source $file >/dev/null
-        if test $status -gt 0
-            echo FAILING FILE $file
-        end
-    end
-end

benchmarks/benchmarks/math.fish

@@ -1,3 +0,0 @@
-for i in (seq 100000)
-    math $i + $i
-end

benchmarks/benchmarks/no_execute.fish

@@ -1,6 +0,0 @@
-set -l path (status dirname)
-set -l fish (status fish-path)
-for f in (seq 100)
-    echo $fish -n $path/aliases.fish
-    $fish -n $path/aliases.fish
-end

benchmarks/benchmarks/printf-escapes.fish

@@ -1 +0,0 @@
-printf (string repeat -n 200 \\x7f)%s\n (string repeat -n 2000 aaa\n)

benchmarks/benchmarks/printf.fish

@@ -1,5 +0,0 @@
-for i in (seq 100000)
-    printf '%f\n' $i.$i
-end
-
-exit 0

benchmarks/benchmarks/read.fish

@@ -1,7 +0,0 @@
-set -l tmp (mktemp)
-string repeat -n 2000 >$tmp
-for i in (seq 1000)
-    cat $tmp | read -l foo
-end
-
-true

benchmarks/benchmarks/seq_echo.fish

@@ -1,3 +0,0 @@
-for i in (seq 10000)
-    echo $i
-end

benchmarks/benchmarks/set_long.fish

@@ -1,3 +0,0 @@
-for abc in (seq 100000)
-    set -l def
-end

benchmarks/benchmarks/string-repeat.fish

@@ -1,3 +0,0 @@
-for i in (string repeat -n 100 \n)
-    string repeat -n 50000 a\n
-end

benchmarks/benchmarks/string-wildcard.fish

@@ -1,3 +0,0 @@
-for i in (seq 100000)
-    string match '*o' fooooooo
-end

benchmarks/benchmarks/string.fish

@@ -1,3 +0,0 @@
-for i in (seq 100000)
-    string match -r '^.*$' fooooooo
-end | string match -re o

benchmarks/driver.sh

@@ -1,43 +0,0 @@
-#!/bin/sh
-
-if [ "$#" -gt 2 ] || [ "$#" -eq 0 ]; then
-    echo "Usage: driver.sh /path/to/fish [/path/to/other/fish]"
-    exit 1
-fi
-
-FISH_PATH=$1
-FISH2_PATH=$2
-BENCHMARKS_DIR=$(dirname "$0")/benchmarks
-
-quote() {
-    # Single-quote the given string for a POSIX shell, except in common cases that don't need it.
-    printf %s "$1" |
-        sed "/[^[:alnum:]\/.-]/ {
-            s/'/'\\\''/g
-            s/^/'/
-            s/\$/'/
-        }"
-}
-
-for benchmark in "$BENCHMARKS_DIR"/*; do
-    basename "$benchmark"
-    # If we have hyperfine, use it first to warm up the cache
-    if command -v hyperfine >/dev/null 2>&1; then
-        cmd1="$(quote "${FISH_PATH}") --no-config $(quote "$benchmark")"
-        if [ -n "$FISH2_PATH" ]; then
-            cmd2="$(quote "${FISH2_PATH}") --no-config $(quote "$benchmark")"
-            hyperfine --warmup 3 "$cmd1" "$cmd2"
-        else
-            hyperfine --warmup 3 "$cmd1"
-        fi
-    fi
-
-    [ -n "$FISH2_PATH" ] && echo "$FISH_PATH"
-    "${FISH_PATH}" --print-rusage-self "$benchmark" > /dev/null
-    if [ -n "$FISH2_PATH" ]; then
-        echo "$FISH2_PATH"
-        "${FISH2_PATH}" --print-rusage-self "$benchmark" > /dev/null
-    fi
-
-done
-

build.rs

@@ -1,273 +0,0 @@
-use fish_build_helper::{
-    env_var, fish_build_dir, target_os, target_os_is_apple, target_os_is_bsd, target_os_is_cygwin,
-    workspace_root,
-};
-use rsconf::Target;
-use std::env;
-use std::path::{Path, PathBuf};
-
-fn canonicalize<P: AsRef<Path>>(path: P) -> PathBuf {
-    std::fs::canonicalize(path).unwrap()
-}
-
-fn main() {
-    setup_paths();
-
-    // Add our default to enable tools that don't go through CMake, like "cargo test" and the
-    // language server.
-
-    rsconf::set_env_value(
-        "FISH_RESOLVED_BUILD_DIR",
-        // If set by CMake, this might include symlinks. Since we want to compare this to the
-        // dir fish is executed in we need to canonicalize it.
-        canonicalize(fish_build_dir()).to_str().unwrap(),
-    );
-
-    // We need to canonicalize (i.e. realpath) the manifest dir because we want to be able to
-    // compare it directly as a string at runtime.
-    rsconf::set_env_value(
-        "CARGO_MANIFEST_DIR",
-        canonicalize(workspace_root()).to_str().unwrap(),
-    );
-
-    // Some build info
-    rsconf::set_env_value("BUILD_TARGET_TRIPLE", &env_var("TARGET").unwrap());
-    rsconf::set_env_value("BUILD_HOST_TRIPLE", &env_var("HOST").unwrap());
-    rsconf::set_env_value("BUILD_PROFILE", &env_var("PROFILE").unwrap());
-
-    let version = &get_version(&env::current_dir().unwrap());
-    // Per https://doc.rust-lang.org/cargo/reference/build-scripts.html#inputs-to-the-build-script,
-    // the source directory is the current working directory of the build script
-    rsconf::set_env_value("FISH_BUILD_VERSION", version);
-
-    fish_build_helper::rebuild_if_embedded_path_changed("share");
-
-    let build = cc::Build::new();
-    let mut target = Target::new_from(build).unwrap();
-    // Keep verbose mode on until we've ironed out rust build script stuff
-    target.set_verbose(true);
-    detect_cfgs(&mut target);
-
-    #[cfg(all(target_env = "gnu", target_feature = "crt-static"))]
-    compile_error!(
-        "Statically linking against glibc has unavoidable crashes and is unsupported. Use dynamic linking or link statically against musl."
-    );
-}
-
-/// Check target system support for certain functionality dynamically when the build is invoked,
-/// without their having to be explicitly enabled in the `cargo build --features xxx` invocation.
-///
-/// We are using [`rsconf::enable_cfg()`] instead of [`rsconf::enable_feature()`] as rust features
-/// should be used for things that a user can/would reasonably enable or disable to tweak or coerce
-/// behavior, but here we are testing for whether or not things are supported altogether.
-///
-/// This can be used to enable features that we check for and conditionally compile according to in
-/// our own codebase, but [can't be used to pull in dependencies](0) even if they're gated (in
-/// `Cargo.toml`) behind a feature we just enabled.
-///
-/// [0]: https://github.com/rust-lang/cargo/issues/5499
-fn detect_cfgs(target: &mut Target) {
-    for (name, handler) in [
-        // Ignore the first entry, it just sets up the type inference.
-        ("", &(|_: &Target| false) as &dyn Fn(&Target) -> bool),
-        ("apple", &(|_| target_os_is_apple())),
-        ("bsd", &(|_| target_os_is_bsd())),
-        ("cygwin", &(|_| target_os_is_cygwin())),
-        ("have_eventfd", &|target| {
-            // FIXME: NetBSD 10 has eventfd, but the libc crate does not expose it.
-            if target_os() == "netbsd" {
-                false
-            } else {
-                target.has_header("sys/eventfd.h")
-            }
-        }),
-        ("have_localeconv_l", &|target| {
-            target.has_symbol("localeconv_l")
-        }),
-        ("have_pipe2", &|target| target.has_symbol("pipe2")),
-        ("have_posix_spawn", &|target| {
-            if matches!(target_os().as_str(), "openbsd" | "android") {
-                // OpenBSD's posix_spawn returns status 127 instead of erroring with ENOEXEC when faced with a
-                // shebang-less script. Disable posix_spawn on OpenBSD.
-                //
-                // Android is broken for unclear reasons
-                false
-            } else {
-                target.has_header("spawn.h")
-            }
-        }),
-        ("small_main_stack", &has_small_stack),
-        ("using_cmake", &|_| {
-            option_env!("FISH_CMAKE_BINARY_DIR").is_some()
-        }),
-        ("waitstatus_signal_ret", &|target| {
-            target.r#if("WEXITSTATUS(0x007f) == 0x7f", &["sys/wait.h"])
-        }),
-    ] {
-        rsconf::declare_cfg(name, handler(target))
-    }
-}
-
-/// Rust sets the stack size of newly created threads to a sane value, but is at at the mercy of the
-/// OS when it comes to the size of the main stack. Some platforms we support default to a tiny
-/// 0.5 MiB main stack, which is insufficient for fish's MAX_EVAL_DEPTH/MAX_STACK_DEPTH values.
-///
-/// 0.5 MiB is small enough that we'd have to drastically reduce MAX_STACK_DEPTH to less than 10, so
-/// we instead use a workaround to increase the main thread size.
-fn has_small_stack(_: &Target) -> bool {
-    #[cfg(not(any(target_os = "ios", target_os = "macos", target_os = "netbsd")))]
-    return false;
-
-    // NetBSD 10 also needs this but can't find pthread_get_stacksize_np.
-    #[cfg(target_os = "netbsd")]
-    return true;
-
-    #[cfg(any(target_os = "ios", target_os = "macos"))]
-    {
-        use core::ffi;
-
-        unsafe extern "C" {
-            unsafe fn pthread_get_stacksize_np(thread: *const ffi::c_void) -> usize;
-            unsafe fn pthread_self() -> *const ffi::c_void;
-        }
-
-        // build.rs is executed on the main thread, so we are getting the main thread's stack size.
-        // Modern macOS versions default to an 8 MiB main stack but legacy OS X have a 0.5 MiB one.
-        let stack_size = unsafe { pthread_get_stacksize_np(pthread_self()) };
-        const TWO_MIB: usize = 2 * 1024 * 1024 - 1;
-        stack_size <= TWO_MIB
-    }
-}
-
-fn setup_paths() {
-    #[cfg(windows)]
-    use unix_path::{Path, PathBuf};
-
-    fn overridable_path(
-        env_var_name: &str,
-        f: impl FnOnce(Option<String>) -> Option<PathBuf>,
-    ) -> Option<PathBuf> {
-        rsconf::rebuild_if_env_changed(env_var_name);
-        let maybe_path = f(env_var(env_var_name));
-        if let Some(path) = maybe_path.as_ref() {
-            rsconf::set_env_value(env_var_name, path.to_str().unwrap());
-        }
-        maybe_path
-    }
-
-    fn join_if_relative(parent_if_relative: &Path, path: String) -> PathBuf {
-        let path = PathBuf::from(path);
-        if path.is_relative() {
-            parent_if_relative.join(path)
-        } else {
-            path
-        }
-    }
-
-    let prefix = overridable_path("PREFIX", |env_prefix| {
-        Some(PathBuf::from(
-            env_prefix.unwrap_or("/usr/local".to_string()),
-        ))
-    })
-    .unwrap();
-
-    overridable_path("SYSCONFDIR", |env_sysconfdir| {
-        Some(join_if_relative(
-            &prefix,
-            env_sysconfdir.unwrap_or("/etc/".to_string()),
-        ))
-    });
-
-    let datadir = overridable_path("DATADIR", |env_datadir| {
-        env_datadir.map(|p| join_if_relative(&prefix, p))
-    });
-    overridable_path("BINDIR", |env_bindir| {
-        env_bindir.map(|p| join_if_relative(&prefix, p))
-    });
-    overridable_path("DOCDIR", |env_docdir| {
-        env_docdir.map(|p| {
-            join_if_relative(
-                &datadir
-                    .expect("Setting DOCDIR without setting DATADIR is not currently supported"),
-                p,
-            )
-        })
-    });
-}
-
-fn get_version(src_dir: &Path) -> String {
-    use std::fs::read_to_string;
-    use std::process::Command;
-
-    if let Some(var) = env_var("FISH_BUILD_VERSION") {
-        return var;
-    }
-
-    let path = src_dir.join("version");
-    if let Ok(strver) = read_to_string(path) {
-        return strver;
-    }
-
-    let args = &["describe", "--always", "--dirty=-dirty"];
-    if let Ok(output) = Command::new("git").args(args).output() {
-        let rev = String::from_utf8_lossy(&output.stdout).trim().to_string();
-        if !rev.is_empty() {
-            // If it contains a ".", we have a proper version like "3.7",
-            // or "23.2.1-1234-gfab1234"
-            if rev.contains('.') {
-                return rev;
-            }
-            // If it doesn't, we probably got *just* the commit SHA,
-            // like "f1242abcdef".
-            // So we prepend the crate version so it at least looks like
-            // "3.8-gf1242abcdef"
-            // This lacks the commit *distance*, but that can't be helped without
-            // tags.
-            let version = env!("CARGO_PKG_VERSION").to_owned();
-            return version + "-g" + &rev;
-        }
-    }
-
-    // git did not tell us a SHA either because it isn't installed,
-    // or because it refused (safe.directory applies to `git describe`!)
-    // So we read the SHA ourselves.
-    fn get_git_hash() -> Result<String, Box<dyn std::error::Error>> {
-        let workspace_root = workspace_root();
-        let gitdir = workspace_root.join(".git");
-        let jjdir = workspace_root.join(".jj");
-        let commit_id = if gitdir.exists() {
-            // .git/HEAD contains ref: refs/heads/branch
-            let headpath = gitdir.join("HEAD");
-            let headstr = read_to_string(headpath)?;
-            let headref = headstr.split(' ').nth(1).unwrap().trim();
-
-            // .git/refs/heads/branch contains the SHA
-            let refpath = gitdir.join(headref);
-            // Shorten to 9 characters (what git describe does currently)
-            read_to_string(refpath)?
-        } else if jjdir.exists() {
-            let output = Command::new("jj")
-                .args([
-                    "log",
-                    "--revisions",
-                    "@",
-                    "--no-graph",
-                    "--ignore-working-copy",
-                    "--template",
-                    "commit_id",
-                ])
-                .output()
-                .unwrap();
-            String::from_utf8_lossy(&output.stdout).to_string()
-        } else {
-            return Err("did not find either of .git or .jj".into());
-        };
-        let refstr = &commit_id[0..9];
-        let refstr = refstr.trim();
-
-        let version = env!("CARGO_PKG_VERSION").to_owned();
-        Ok(version + "-g" + refstr)
-    }
-
-    get_git_hash().expect("Could not get a version. Either set $FISH_BUILD_VERSION or install git.")
-}

build_tools/build_documentation.sh

@@ -0,0 +1,136 @@
+#!/bin/sh
+
+# This script is run as part of the build process
+
+if test $# -eq 0
+then
+	# Use fish's defaults
+	DOXYFILE=Doxyfile.help
+	INPUTDIR=doc_src
+	OUTPUTDIR=share
+	echo "Using defaults: $0 ${DOXYFILE} ${INPUTDIR} ${OUTPUTDIR}"
+elif test $# -eq 3
+then
+	DOXYFILE="$1"
+	INPUTDIR="$2"
+	OUTPUTDIR="$3"
+else
+	echo "Usage: $0 doxygen_file input_directory output_directory"
+	exit 1
+fi
+
+# Determine which man pages we don't want to generate.
+# Don't make a test man page. fish's test is conforming, so the system man pages
+# are applicable and generally better.
+# on OS X, don't make a man page for open, since we defeat fish's open function on OS X.
+CONDEMNED_PAGES=test.1
+if test `uname` = 'Darwin'; then
+	CONDEMNED_PAGES="$CONDEMNED_PAGES open.1"
+fi
+
+# Helper function to turn a relative path into an absolute path
+resolve_path()
+{
+	D=`command dirname "$1"`
+	B=`command basename "$1"`
+	echo "`cd \"$D\" 2>/dev/null && pwd || echo \"$D\"`/$B"
+}
+
+# Expand relative paths
+DOXYFILE=`resolve_path "$DOXYFILE"`
+INPUTDIR=`resolve_path "$INPUTDIR"`
+OUTPUTDIR=`resolve_path "$OUTPUTDIR"`
+
+echo "      doxygen file: $DOXYFILE"
+echo "   input directory: $INPUTDIR"
+echo "  output directory: $OUTPUTDIR"
+echo "          skipping: $CONDEMNED_PAGES"
+
+# Make sure INPUTDIR is found
+if test ! -d "$INPUTDIR"; then
+	echo >&2 "Could not find input directory '${INPUTDIR}'"
+	exit 1
+fi
+
+# Make sure doxygen is found
+DOXYGENPATH=`command -v doxygen`
+if test -z "$DOXYGENPATH" ; then
+    for i in /usr/local/bin/doxygen /opt/bin/doxygen /Applications/Doxygen.app/Contents/Resources/doxygen ~/Applications/Doxygen.app/Contents/Resources/doxygen ; do
+    	if test -f "$i"; then
+    	    DOXYGENPATH="$i"
+    	    break
+    	fi
+    done
+fi
+
+if test -z "$DOXYGENPATH"; then
+    echo >&2 "doxygen is not installed, so documentation will not be built."
+    exit 0
+fi
+
+# Determine where our output should go
+if ! mkdir -p "${OUTPUTDIR}" ; then
+    echo "Could not create output directory '${OUTPUTDIR}'"
+fi
+
+# Make a temporary directory
+TMPLOC=`mktemp -d -t fish_doc_build_XXXXXX` || { echo >&2 "Could not build documentation because mktemp failed"; exit 1; }
+
+# Copy stuff to the temp directory
+for i in "$INPUTDIR"/*.txt; do
+	INPUTFILE=$TMPLOC/`basename $i .txt`.doxygen
+	echo  "/** \page" `basename $i .txt` > $INPUTFILE
+	cat $i >>$INPUTFILE
+	echo "*/" >>$INPUTFILE
+done
+
+# Make some extra stuff to pass to doxygen
+# Input is kept as . because we cd to the input directory beforehand
+# This prevents doxygen from generating "documentation" for intermediate directories
+DOXYPARAMS=$(cat <<EOF
+PROJECT_NUMBER=2.0.0
+INPUT=.
+OUTPUT_DIRECTORY=$OUTPUTDIR
+QUIET=YES
+EOF
+);
+
+# echo "$DOXYPARAMS"
+
+# Clear out the output directory first
+find "${OUTPUTDIR}" -name "*.1" -delete
+
+# Run doxygen
+cd "$TMPLOC"
+(cat "${DOXYFILE}" ; echo "$DOXYPARAMS";) | "$DOXYGENPATH" - 
+
+# Remember errors
+RESULT=$?
+
+cd "${OUTPUTDIR}/man/man1/"
+if test "$RESULT" = 0 ; then
+
+	# Postprocess the files
+	for i in "$INPUTDIR"/*.txt; do
+		# It would be nice to use -i here for edit in place, but that is not portable 
+		CMD_NAME=`basename "$i" .txt`;
+		sed -e "s/\(.\)\\.SH/\1/" -e "s/$CMD_NAME *\\\\- *\"\(.*\)\"/\1/" "${CMD_NAME}.1" > "${CMD_NAME}.1.tmp"
+		mv "${CMD_NAME}.1.tmp" "${CMD_NAME}.1"
+	done
+	
+	# Erase condemned pages
+	rm -f $CONDEMNED_PAGES
+	
+fi
+
+# Destroy TMPLOC
+echo "Cleaning up '$TMPLOC'"
+rm -Rf "$TMPLOC"
+
+if test "$RESULT" = 0; then
+    # Tell the user what we did
+    echo "Output man pages into '${OUTPUTDIR}'"
+else
+    echo "Doxygen failed. See the output log for details."
+fi
+exit $RESULT

build_tools/check.sh

@@ -1,94 +0,0 @@
-#!/bin/sh
-
-{
-set -ex
-
-lint=true
-if [ "$FISH_CHECK_LINT" = false ]; then
-    lint=false
-fi
-
-check_dependency_versions=false
-if [ "${FISH_CHECK_DEPENDENCY_VERSIONS:-false}" != false ]; then
-    check_dependency_versions=true
-fi
-
-if $check_dependency_versions; then
-    command -v curl
-    command -v jq
-    command -v rustup
-    command -v uv
-    sort --version-sort </dev/null
-    # To match existing behavior, only check Rust/dockerfiles for now.
-    # TODO: remove this from this script.
-    updatecli diff --config=updatecli.d/docker.yml --config=updatecli.d/rust.yml
-fi
-
-cargo_args=$FISH_CHECK_CARGO_ARGS
-target_triple=$FISH_CHECK_TARGET_TRIPLE
-if [ -n "$target_triple" ]; then
-    cargo_args="$cargo_args --target=$FISH_CHECK_TARGET_TRIPLE"
-fi
-
-cargo() {
-    subcmd=$1
-    shift
-    if [ -n "$FISH_CHECK_RUST_TOOLCHAIN" ]; then
-        # shellcheck disable=2086
-        command cargo "+$FISH_CHECK_RUST_TOOLCHAIN" "$subcmd" $cargo_args "$@"
-    else
-        # shellcheck disable=2086
-        command cargo "$subcmd" $cargo_args "$@"
-    fi
-}
-
-cleanup () {
-    if [ -n "$gettext_template_dir" ] && [ -e "$gettext_template_dir" ]; then
-        rm -r "$gettext_template_dir"
-    fi
-}
-
-trap cleanup EXIT INT TERM HUP
-
-if $lint; then
-    export RUSTFLAGS="--deny=warnings ${RUSTFLAGS}"
-    export RUSTDOCFLAGS="--deny=warnings ${RUSTDOCFLAGS}"
-fi
-
-workspace_root="$(dirname "$0")/.."
-target_dir=${CARGO_TARGET_DIR:-$workspace_root/target}
-if [ -n "$target_triple" ]; then
-    target_dir="$target_dir/$target_triple"
-fi
-# The directory containing the binaries produced by cargo/rustc.
-# Currently, all builds are debug builds.
-build_dir="$target_dir/debug"
-
-if [ -n "$FISH_TEST_MAX_CONCURRENCY" ]; then
-    export RUST_TEST_THREADS="$FISH_TEST_MAX_CONCURRENCY"
-    export CARGO_BUILD_JOBS="$FISH_TEST_MAX_CONCURRENCY"
-fi
-
-gettext_template_dir=$(mktemp -d)
-(
-    export FISH_GETTEXT_EXTRACTION_DIR="$gettext_template_dir"
-    cargo build --workspace --all-targets --features=gettext-extract
-)
-if $lint; then
-    if command -v cargo-deny >/dev/null; then
-        cargo deny --all-features --locked --exclude-dev check licenses
-    fi
-    PATH="$build_dir:$PATH" "$workspace_root/build_tools/style.fish" --all --check
-    for features in "" --no-default-features; do
-        cargo clippy --workspace --all-targets $features
-    done
-fi
-cargo test --no-default-features --workspace --all-targets
-cargo test --doc --workspace
-if $lint; then
-    cargo doc --workspace --no-deps
-fi
-FISH_GETTEXT_EXTRACTION_DIR=$gettext_template_dir "$workspace_root/tests/test_driver.py" "$build_dir"
-
-exit
-}

build_tools/description-pak

@@ -0,0 +1,3 @@
+This is the_ridiculous'fish s delightful fork of, fish friendly interactive shell. For more information, visit http://ridiculousfish.com/shell/ .
+
+This installer will install fish, but will not modify your /etc/shells file or your default shell. I trust you know how to do that yourself if you care to!

build_tools/diff_profiles.fish

@@ -1,53 +0,0 @@
-#!/usr/bin/env fish
-#
-# Compares the output of two fish profile runs and emits the time difference between
-# the first and second set of results.
-#
-# Usage: ./diff_profiles.fish profile1.log profile2.log > profile_diff.log
-
-if test (count $argv) -ne 2
-
-    echo "Incorrect number of arguments."
-    echo "Usage: "(status filename)" profile1.log profile2.log"
-    exit 1
-end
-
-set -l profile1 (cat $argv[1])
-set -l profile2 (cat $argv[2])
-
-set -l line_no 0
-while set -l next_line_no (math $line_no + 1) && set -q profile1[$next_line_no] && set -q profile2[$next_line_no]
-    set line_no $next_line_no
-
-    set -l line1 $profile1[$line_no]
-    set -l line2 $profile2[$line_no]
-
-    if not string match -qr '^\s*\d+\s+\d+' $line1
-        echo $line1
-        continue
-    end
-
-    set -l results1 (string match -r '^\s*(\d+)\s+(\d+)\s+(.*)' $line1)
-    set -l results2 (string match -r '^\s*(\d+)\s+(\d+)\s+(.*)' $line2)
-
-    # times from both files
-    set -l time1 $results1[2..3]
-    set -l time2 $results2[2..3]
-
-    # leftover from both files
-    set -l remainder1 $results1[4]
-    set -l remainder2 $results2[4]
-
-    if not string match -q -- $remainder1 $remainder2
-        echo Mismatch on line $line_no:
-        echo - $remainder1
-        echo + $remainder2
-        exit 1
-    end
-
-    set -l diff
-    set diff[1] (math $time1[1] - $time2[1])
-    set diff[2] (math $time1[2] - $time2[2])
-
-    printf '%10d %10d %s\n' $diff[1] $diff[2] $remainder1
-end

build_tools/fish_xgettext.fish

@@ -1,147 +0,0 @@
-#!/usr/bin/env fish
-#
-# Tool to generate gettext messages template file.
-# Writes to stdout.
-# Intended to be called from `update_translations.fish`.
-
-argparse use-existing-template= -- $argv
-or exit $status
-
-begin
-    # Write header. This is required by msguniq.
-    # Note that this results in the file being overwritten.
-    # This is desired behavior, to get rid of the results of prior invocations
-    # of this script.
-    begin
-        echo 'msgid ""'
-        echo 'msgstr ""'
-        echo '"Content-Type: text/plain; charset=UTF-8\n"'
-        echo ""
-    end
-
-    set -g workspace_root (path resolve (status dirname)/..)
-
-    set -l rust_extraction_dir
-    if set -l --query _flag_use_existing_template
-        set rust_extraction_dir $_flag_use_existing_template
-    else
-        set rust_extraction_dir (mktemp -d)
-        # We need to build to ensure that the proc macro for extracting strings runs.
-        FISH_GETTEXT_EXTRACTION_DIR=$rust_extraction_dir cargo check --features=gettext-extract
-        or exit 1
-    end
-
-    function mark_section
-        set -l section_name $argv[1]
-        echo 'msgid "fish-section-'$section_name'"'
-        echo 'msgstr ""'
-        echo ''
-    end
-
-    mark_section tier1-from-rust
-
-    # Get rid of duplicates and sort.
-    find $rust_extraction_dir -type f -exec cat {} + | msguniq --no-wrap --sort-output
-    or exit 1
-
-    if not set -l --query _flag_use_existing_template
-        rm -r $rust_extraction_dir
-    end
-
-    function extract_fish_script_messages_impl
-        set -l regex $argv[1]
-        set -e argv[1]
-        # Using xgettext causes more trouble than it helps.
-        # This is due to handling of escaping in fish differing from formats xgettext understands
-        # (e.g. POSIX shell strings).
-        # We work around this issue by manually writing the file content.
-
-        # Steps:
-        # 1. We extract strings to be translated from the relevant files and drop the rest. This step
-        #    depends on the regex matching the entire line, and the first capture group matching the
-        #    string.
-        # 2. We unescape. This gets rid of some escaping necessary in fish strings.
-        # 3. The resulting strings are sorted alphabetically. This step is optional. Not sorting would
-        #    result in strings from the same file appearing together. Removing duplicates is also
-        #    optional, since msguniq takes care of that later on as well.
-        # 4. Single backslashes are replaced by double backslashes. This results in the backslashes
-        #    being interpreted as literal backslashes by gettext tooling.
-        # 5. Double quotes are escaped, such that they are not interpreted as the start or end of
-        #    a msgid.
-        # 6. We transform the string into the format expected in a PO file.
-        cat $argv |
-            string replace --filter --regex $regex '$1' |
-            string unescape |
-            sort -u |
-            sed -E -e 's_\\\\_\\\\\\\\_g' -e 's_"_\\\\"_g' -e 's_^(.*)$_msgid "\1"\nmsgstr ""\n_'
-    end
-
-    function extract_fish_script_messages
-        set -l tier $argv[1]
-        set -e argv[1]
-        if not set -q argv[1]
-            return
-        end
-        # This regex handles explicit requests to translate a message. These are more important to translate
-        # than messages which should be implicitly translated.
-        set -l explicit_regex '.*\( *_ (([\'"]).+?(?<!\\\\)\\2) *\).*'
-        mark_section "$tier-from-script-explicitly-added"
-        extract_fish_script_messages_impl $explicit_regex $argv
-
-        # This regex handles descriptions for `complete` and `function` statements. These messages are not
-        # particularly important to translate. Hence the "implicit" label.
-        set -l implicit_regex '^(?:\s|and |or )*(?:complete|function).*? (?:-d|--description) (([\'"]).+?(?<!\\\\)\\2).*'
-        mark_section "$tier-from-script-implicitly-added"
-        extract_fish_script_messages_impl $implicit_regex $argv
-    end
-
-    set -g share_dir $workspace_root/share
-
-    set -l tier1 $share_dir/config.fish
-    set -l tier2
-    set -l tier3
-
-    for file in $share_dir/completions/*.fish $share_dir/functions/*.fish
-        # set -l tier (string match -r '^# localization: .*' <$file)
-        set -l tier (string replace -rf -m1 \
-            '^# localization: (.*)$' '$1' <$file)
-        if set -q tier[1]
-            switch "$tier"
-                case tier1 tier2 tier3
-                    set -a $tier $file
-                case 'skip*'
-                case '*'
-                    echo >&2 "$file:1 unexpected localization tier: $tier"
-                    exit 1
-            end
-            continue
-        end
-        set -l dirname (path basename (path dirname $file))
-        set -l command_name (path basename --no-extension $file)
-        if test $dirname = functions &&
-                string match -q -- 'fish_*' $command_name
-            set -a tier1 $file
-            continue
-        end
-        if test $dirname != completions
-            echo >&2 "$file:1 missing localization tier for function file"
-            exit 1
-        end
-        if test -e $workspace_root/doc_src/cmds/$command_name.rst
-            set -a tier1 $file
-        else
-            set -a tier3 $file
-        end
-    end
-
-    extract_fish_script_messages tier1 $tier1
-    extract_fish_script_messages tier2 $tier2
-    extract_fish_script_messages tier3 $tier3
-end |
-    # At this point, all extracted strings have been written to stdout,
-    # starting with the ones taken from the Rust sources,
-    # followed by strings explicitly marked for translation in fish scripts,
-    # and finally the strings from fish scripts which get translated implicitly.
-    # Because we do not eliminate duplicates across these categories,
-    # we do it here, since other gettext tools expect no duplicates.
-    msguniq --no-wrap

build_tools/git_version_gen.sh

@@ -1,70 +0,0 @@
-#!/bin/sh
-# Originally from the git sources (GIT-VERSION-GEN)
-# Presumably (C) Junio C Hamano <junkio@cox.net>
-# Reused under GPL v2.0
-# Modified for fish by David Adam <zanchey@ucc.gu.uwa.edu.au>
-
-set -e
-
-# Find the fish directory as two levels up from script directory.
-FISH_BASE_DIR="$( cd "$( dirname "$( dirname "$0" )" )" && pwd )"
-DEF_VER=unknown
-git_permission_failed=0
-
-# First see if there is a version file (included in release tarballs),
-# then try git-describe, then default.
-if test -f "$FISH_BASE_DIR"/version
-then
-	VN=$(cat "$FISH_BASE_DIR"/version) || VN="$DEF_VER"
-else
-    if VN=$(git -C "$FISH_BASE_DIR" describe --always --dirty 2>/dev/null); then
-       :
-    else
-        if test $? = 128; then
-            # Current git versions return status 128
-            # when run in a repo owned by another user.
-            # Even for describe and everything.
-            # This occurs for `sudo make install`.
-            git_permission_failed=1
-        fi
-	    VN="$DEF_VER"
-    fi
-fi
-
-# If the first param is --stdout, then output to stdout and exit.
-if test "$1" = '--stdout'
-then
-	echo $VN
-    exit 0
-fi
-
-# Set the output directory as either the first param or cwd.
-test -n "$1" && OUTPUT_DIR=$1/ || OUTPUT_DIR=
-FBVF="${OUTPUT_DIR}FISH-BUILD-VERSION-FILE"
-
-if test "$VN" = unknown && test -r "$FBVF" && test "$git_permission_failed" = 1
-then
-    # HACK: Git failed, so we keep the current version file.
-    # This helps in case you built fish as a normal user
-    # and then try to `sudo make install` it.
-    date +%s > "${OUTPUT_DIR}"fish-build-version-witness.txt
-    exit 0
-fi
-
-if test -r "$FBVF"
-then
-	VC=$(cat "$FBVF")
-else
-	VC="unset"
-fi
-
-# Maybe output the FBVF
-# It looks like "2.7.1-621-ga2f065e6"
-test "$VN" = "$VC" || {
-	echo >&2 "$VN"
-	echo "$VN" >"$FBVF"
-}
-
-# Output the fish-build-version-witness.txt
-# See https://cmake.org/cmake/help/v3.4/policy/CMP0058.html
-date +%s > "${OUTPUT_DIR}"fish-build-version-witness.txt

build_tools/ios_entitlements.xml

@@ -1,392 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>platform-application</key>
-    <true/>
-    <key>com.apple.private.security.no-container</key>
-    <true/>
-    <key>com.apple.private.security.container-manager</key>
-    <true/>
-    <key>com.apple.private.skip-library-validation</key>
-    <true/>
-    <key>com.apple.private.MobileContainerManager.allowed</key>
-    <true/>
-    <key>com.apple.private.security.storage.adprivacyd</key>
-    <true/>
-    <key>com.apple.private.security.storage.amfid</key>
-    <true/>
-    <key>com.apple.private.security.storage.AppBundles</key>
-    <true/>
-    <key>com.apple.private.security.storage.AppDataContainers</key>
-    <true/>
-    <key>com.apple.private.security.storage.automation-mode</key>
-    <true/>
-    <key>com.apple.private.security.storage.Biome</key>
-    <true/>
-    <key>com.apple.private.security.storage.Calendar</key>
-    <true/>
-    <key>com.apple.private.security.storage.CallHistory</key>
-    <true/>
-    <key>com.apple.private.security.storage.CarrierBundles</key>
-    <true/>
-    <key>com.apple.private.security.storage.chronod</key>
-    <true/>
-    <key>com.apple.private.security.storage.CloudDocsDB</key>
-    <true/>
-    <key>com.apple.private.security.storage.CloudKit</key>
-    <true/>
-    <key>com.apple.private.security.storage.containers</key>
-    <true/>
-    <key>com.apple.private.security.storage.CoreFollowUp</key>
-    <true/>
-    <key>com.apple.private.security.storage.CoreKnowledge</key>
-    <true/>
-    <key>com.apple.private.security.storage.Cryptex</key>
-    <true/>
-    <key>com.apple.private.security.storage.demo_backup</key>
-    <true/>
-    <key>com.apple.private.security.storage.DocumentRevisions</key>
-    <true/>
-    <key>com.apple.private.security.storage.DumpPanic</key>
-    <true/>
-    <key>com.apple.private.security.storage.ExposureNotification</key>
-    <true/>
-    <key>com.apple.private.security.storage.FaceTime</key>
-    <true/>
-    <key>com.apple.private.security.storage.familycircled</key>
-    <true/>
-    <key>com.apple.private.security.storage.FindMy</key>
-    <true/>
-    <key>com.apple.private.security.storage.fpsd</key>
-    <true/>
-    <key>com.apple.private.security.storage.Health</key>
-    <true/>
-    <key>com.apple.private.security.storage.HomeAI</key>
-    <true/>
-    <key>com.apple.private.security.storage.HomeKit</key>
-    <true/>
-    <key>com.apple.private.security.storage.iCloudDrive</key>
-    <true/>
-    <key>com.apple.private.security.storage.idcredd</key>
-    <true/>
-    <key>com.apple.private.security.storage.IdentityServices</key>
-    <true/>
-    <key>com.apple.private.security.storage.kbd</key>
-    <true/>
-    <key>com.apple.private.security.storage.Keychains</key>
-    <true/>
-    <key>com.apple.private.security.storage.Lockdown</key>
-    <true/>
-    <key>com.apple.private.security.storage.Mail</key>
-    <true/>
-    <key>com.apple.private.security.storage.Messages</key>
-    <true/>
-    <key>com.apple.private.security.storage.MessagesMetaData</key>
-    <true/>
-    <key>com.apple.private.security.storage.MobileContainerManager</key>
-    <true/>
-    <key>com.apple.private.security.storage.MobileDocuments</key>
-    <true/>
-    <key>com.apple.private.security.storage.MobileIdentityService</key>
-    <true/>
-    <key>com.apple.private.security.storage.mobilesync</key>
-    <true/>
-    <key>com.apple.private.security.storage.multimodalsearchd</key>
-    <true/>
-    <key>com.apple.private.security.storage.NanoTimeKit.FaceSupport</key>
-    <true/>
-    <key>com.apple.private.security.storage.News</key>
-    <true/>
-    <key>com.apple.private.security.storage.Notes</key>
-    <true/>
-    <key>com.apple.private.security.storage.Photos</key>
-    <true/>
-    <key>com.apple.private.security.storage.PhotosLibraries</key>
-    <true/>
-    <key>com.apple.private.security.storage.pipelined</key>
-    <true/>
-    <key>com.apple.private.security.storage.preferences</key>
-    <true/>
-    <key>com.apple.private.security.storage.PrivacyAccounting</key>
-    <true/>
-    <key>com.apple.private.security.storage.Safari</key>
-    <true/>
-    <key>com.apple.private.security.storage.SearchParty</key>
-    <true/>
-    <key>com.apple.private.security.storage.SecureElementService</key>
-    <true/>
-    <key>com.apple.private.security.storage.SensorKit</key>
-    <true/>
-    <key>com.apple.private.security.storage.SFAnalytics</key>
-    <true/>
-    <key>com.apple.private.security.storage.SiriInference</key>
-    <true/>
-    <key>com.apple.private.security.storage.SiriReferenceResolution</key>
-    <true/>
-    <key>com.apple.private.security.storage.SiriVocabulary</key>
-    <true/>
-    <key>com.apple.private.security.storage.SoC</key>
-    <true/>
-    <key>com.apple.private.security.storage.SpeechPersonalizedLM</key>
-    <true/>
-    <key>com.apple.private.security.storage.Spotlight</key>
-    <true/>
-    <key>com.apple.private.security.storage.StatusKit</key>
-    <true/>
-    <key>com.apple.private.security.storage.Stocks</key>
-    <true/>
-    <key>com.apple.private.security.storage.Suggestions</key>
-    <true/>
-    <key>com.apple.private.security.storage.SymptomFramework</key>
-    <true/>
-    <key>com.apple.private.security.storage.sysdagnose.ScreenshotServicesService</key>
-    <true/>
-    <key>com.apple.private.security.storage.TCC</key>
-    <true/>
-    <key>com.apple.private.security.storage.TimeMachine</key>
-    <true/>
-    <key>com.apple.private.security.storage.triald</key>
-    <true/>
-    <key>com.apple.private.security.storage.trustd</key>
-    <true/>
-    <key>com.apple.private.security.storage.trustd-private</key>
-    <true/>
-    <key>com.apple.private.security.storage.universalaccess</key>
-    <true/>
-    <key>com.apple.private.security.storage.Voicemail</key>
-    <true/>
-    <key>com.apple.private.security.storage.Wireless</key>
-    <true/>
-    <key>com.apple.private.security.disk-device-access</key>
-    <true/>
-    <key>com.apple.rootless.storage.ane_model_cache</key>
-    <true/>
-    <key>com.apple.rootless.storage.apfs_boot_mount</key>
-    <true/>
-    <key>com.apple.rootless.storage.clientScripter</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.mediaanalysisd</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.CarPlayAppBlacklist</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.DeviceCheck</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.DictionaryServices.dictionary2</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.DuetExpertCenterAsset</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.EmbeddedNL</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.Font5</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.Font6</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.HealthKt.FeatureAvailability</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.HomeKit</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.MacinTalkVoiceAssets</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.MailDynamicData</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.MXLongFormVideoApps</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.network.networknomicon</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.PKITrustSupplementals</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.SharingDeviceAssets</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.SiriShortcutsMobileAsset</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.TimeZoneUpdate</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.VoiceServices.CombinedVocalizerVoices</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.VoiceServices.CustomVoice</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.VoiceServices.GryphonVoice</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.VoiceServicesVocalizerVoice</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.VoiceServices.VoiceResources</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.VoiceTriggerAssets</key>
-    <true/>
-    <key>com.apple.rootless.storage.CoreAnalytics</key>
-    <true/>
-    <key>com.apple.rootless.storage.coreduet_knowledge_store</key>
-    <true/>
-    <key>com.apple.rootless.storage.coreidvd</key>
-    <true/>
-    <key>com.apple.rootless.storage.coreknowledge</key>
-    <true/>
-    <key>com.apple.rootless.storage.CoreRoutine</key>
-    <true/>
-    <key>com.apple.rootless.storage.CoreSpeech</key>
-    <true/>
-    <key>com.apple.rootless.storage.dmd</key>
-    <true/>
-    <key>com.apple.rootless.storage.dprivacyd_storage</key>
-    <true/>
-    <key>com.apple.rootless.storage.ExtensibleSSO</key>
-    <true/>
-    <key>com.apple.rootless.storage.facekit</key>
-    <true/>
-    <key>com.apple.rootless.storage.fpsd</key>
-    <true/>
-    <key>com.apple.rootless.storage.MobileStorageMounter</key>
-    <true/>
-    <key>com.apple.rootless.storage.MusicApp</key>
-    <true/>
-    <key>com.apple.rootless.storage.nsurlsessiond</key>
-    <true/>
-    <key>com.apple.rootless.storage.pearl-field-diagnostics</key>
-    <true/>
-    <key>com.apple.rootless.storage.proactivepredictions</key>
-    <true/>
-    <key>com.apple.rootless.storage.QLThumbnailCache</key>
-    <true/>
-    <key>com.apple.rootless.storage.remotemanagementd</key>
-    <true/>
-    <key>com.apple.rootless.storage.RoleAccountStaging</key>
-    <true/>
-    <key>com.apple.rootless.storage.sensorkit</key>
-    <true/>
-    <key>com.apple.rootless.storage.shortcuts</key>
-    <true/>
-    <key>com.apple.rootless.storage.siriremembers</key>
-    <true/>
-    <key>com.apple.rootless.storage.timezone</key>
-    <true/>
-    <key>com.apple.rootless.storage.triald</key>
-    <true/>
-    <key>com.apple.rootless.storage.voiceshortcuts</key>
-    <true/>
-    <key>com.apple.private.security.storage-exempt.heritable</key>
-    <true/>
-    <key>com.apple.private.security.storage.AppleMediaServices</key>
-    <true/>
-    <key>com.apple.private.security.storage.ContactlessReader</key>
-    <true/>
-    <key>com.apple.private.security.storage.CoreRoutine</key>
-    <true/>
-    <key>com.apple.private.security.storage.DiagnosticReports</key>
-    <true/>
-    <key>com.apple.private.security.storage.DiagnosticReports.read-write</key>
-    <true/>
-    <key>com.apple.private.security.storage.DoNotDisturb</key>
-    <true/>
-    <key>com.apple.private.security.storage.Home</key>
-    <true/>
-    <key>com.apple.private.security.storage.IntelligencePlatform</key>
-    <true/>
-    <key>com.apple.private.security.storage.Location</key>
-    <true/>
-    <key>com.apple.private.security.storage.ManagedConfiguration</key>
-    <true/>
-    <key>com.apple.private.security.storage.MapsSync</key>
-    <true/>
-    <key>com.apple.private.security.storage.MobileBackup</key>
-    <true/>
-    <key>com.apple.private.security.storage.MobileStorageMounter</key>
-    <true/>
-    <key>com.apple.private.security.storage.PassKit</key>
-    <true/>
-    <key>com.apple.private.security.storage.SiriFeatureStore</key>
-    <true/>
-    <key>com.apple.private.security.storage.SiriSELF</key>
-    <true/>
-    <key>com.apple.private.security.storage.SoundProfileAsset</key>
-    <true/>
-    <key>com.apple.private.security.storage.TextUnderstanding</key>
-    <true/>
-    <key>com.apple.private.security.storage.Weather</key>
-    <true/>
-    <key>com.apple.private.security.storage.appleaccountd</key>
-    <true/>
-    <key>com.apple.private.security.storage.ciconia</key>
-    <true/>
-    <key>com.apple.private.security.storage.clipserviced</key>
-    <true/>
-    <key>com.apple.private.security.storage.coreduet_knowledge_store</key>
-    <true/>
-    <key>com.apple.private.security.storage.driverkitd</key>
-    <true/>
-    <key>com.apple.private.security.storage.geoanalyticsd</key>
-    <true/>
-    <key>com.apple.private.security.storage.geod</key>
-    <true/>
-    <key>com.apple.private.security.storage.launchd</key>
-    <true/>
-    <key>com.apple.private.security.storage.sessionkitd</key>
-    <true/>
-    <key>com.apple.private.security.storage.sysdiagnose.ScreenshotServicesService</key>
-    <true/>
-    <key>com.apple.private.security.storage.sysdiagnose.sysdiagnose</key>
-    <true/>
-    <key>com.apple.private.security.storage.tmp</key>
-    <true/>
-    <key>com.apple.rootless.critical</key>
-    <true/>
-    <key>com.apple.rootless.datavault.metadata</key>
-    <true/>
-    <key>com.apple.rootless.install</key>
-    <true/>
-    <key>com.apple.rootless.install.heritable</key>
-    <true/>
-    <key>com.apple.rootless.restricted-block-devices</key>
-    <true/>
-    <key>com.apple.rootless.storage.MobileAssetDownload</key>
-    <true/>
-    <key>com.apple.rootless.storage.amsengagementd</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.HealthKit.FeatureAvailability</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.Trial.Siri.SiriDialogAssets</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.Trial.Siri.SiriExperienceCam</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.Trial.Siri.SiriFindMyConfigurationFiles</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.Trial.Siri.SiriInferredHelpfulness</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.Trial.Siri.SiriTextToSpeech</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.Trial.Siri.SiriUnderstandingAsrAssistant</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.Trial.Siri.SiriUnderstandingAsrHammer</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.Trial.Siri.SiriUnderstandingAsrUaap</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.Trial.Siri.SiriUnderstandingAttentionAssets</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.Trial.Siri.SiriUnderstandingMorphun</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.Trial.Siri.SiriUnderstandingNL</key>
-    <true/>
-    <key>com.apple.rootless.storage.com.apple.MobileAsset.Trial.Siri.SiriUnderstandingNLOverrides</key>
-    <true/>
-    <key>com.apple.rootless.storage.coreparsec_feedbacks</key>
-    <true/>
-    <key>com.apple.rootless.storage.coreparsec_uploadables</key>
-    <true/>
-    <key>com.apple.rootless.storage.early_boot_mount</key>
-    <true/>
-    <key>com.apple.rootless.storage.screentime</key>
-    <true/>
-    <key>com.apple.rootless.volume.ISCRecovery</key>
-    <true/>
-    <key>com.apple.rootless.volume.Preboot</key>
-    <true/>
-    <key>com.apple.rootless.volume.Recovery</key>
-    <true/>
-    <key>com.apple.rootless.volume.Update</key>
-    <true/>
-    <key>com.apple.rootless.volume.VM</key>
-    <true/>
-    <key>com.apple.rootless.volume.iSCPreboot</key>
-    <true/>
-</dict>
-</plist>

build_tools/list_committers_since.fish

@@ -1,36 +0,0 @@
-#! /usr/bin/env fish
-
-set -l TAG $argv[1]
-
-if test -z "$TAG"
-    echo "Tag name required."
-    exit 1
-end
-
-if not contains -- $TAG (git tag)
-    echo "$TAG is not a valid tag name."
-    exit 1
-end
-
-set -l committers_to_tag (mktemp)
-or exit 1
-set -l committers_from_tag (mktemp)
-or exit 1
-
-# You might think it would be better to case-insensitively sort/compare the names
-# to produce a more natural-looking list.
-# Unicode collation tables mean that this is fraught with danger; for example, the
-# "“" character will not case-fold in UTF-8 locales. sort suggests using the C locale!
-
-git log "$TAG" --format="%aN" --reverse | sort -u >$committers_to_tag
-git log "$TAG".. --format="%aN" --reverse | sort -u >$committers_from_tag
-
-echo New committers:
-echo (comm -13 $committers_to_tag $committers_from_tag)','
-
-echo
-
-echo Returning committers:
-echo (comm -12 $committers_to_tag $committers_from_tag)','
-
-rm $committers_to_tag $committers_from_tag

build_tools/lsan_suppressions.txt

@@ -1,3 +0,0 @@
-# LSAN can detect leaks tracing back to __asan::AsanThread::ThreadStart (probably caused by our
-# threads not exiting before their TLS dtors are called). Just ignore it.
-leak:AsanThread

build_tools/mac_notarize.sh

@@ -1,43 +0,0 @@
-#!/bin/sh
-
-# Helper to notarize an .app.zip or .pkg file.
-
-set -e
-
-die() { echo "$*" 1>&2 ; exit 1; }
-
-
-test "$#" -ge 1 || die "No paths specified."
-
-for INPUT in "$@"; do
-    echo "Processing $INPUT"
-    test -f "$INPUT" || die "Not a file: $INPUT"
-    ext="${INPUT##*.}"
-    { test "$ext" = "zip" || test "$ext" = "pkg"; } || die "Unrecognized extension: $ext"
-
-    xcrun notarytool submit "$INPUT" --keychain-profile AC_PASSWORD --wait
-
-    if test "$ext" = "zip"; then
-        TMPDIR=$(mktemp -d)
-        echo "Extracting to $TMPDIR"
-        unzip -q "$INPUT" -d "$TMPDIR"
-        STAPLE_TARGET=$(echo "$TMPDIR"/*)
-    else
-        STAPLE_TARGET="$INPUT"
-    fi
-    echo "Stapling $STAPLE_TARGET"
-    xcrun stapler staple "$STAPLE_TARGET"
-
-    if test "$ext" = "zip"; then
-        # Zip it back up.
-        INPUT_FULL=$(realpath "$INPUT")
-        rm -f "$INPUT"
-        cd "$(dirname "$STAPLE_TARGET")"
-        zip -r -q "$INPUT_FULL" "$(basename "$STAPLE_TARGET")"
-    fi
-    echo "Processed $INPUT"
-
-    if test "$ext" = "zip"; then
-        spctl -a -v "$STAPLE_TARGET"
-    fi
-done

build_tools/make_csv_completions.fish

@@ -0,0 +1,8 @@
+#!/usr/bin/env fish
+#
+# This file produces command specific completions for csv. Meant to be executed
+# from the root directory (so the completions get put in the right place).
+
+. build_tools/make_vcs_completions_generic.fish
+
+write_completions csv >share/completions/csv.fish

build_tools/make_darcs_completions.fish

@@ -0,0 +1,12 @@
+#!/usr/bin/env fish
+#
+# This file produces command specific completions for darcs. Meant to be 
+# executed from the root directory (so the completions get put in the right 
+# place).
+
+. build_tools/make_vcs_completions_generic.fish
+
+set darcs_comp 'complete -c darcs -n "not __fish_use_subcommand" -a "(test -f _darcs/prefs/repos; and cat _darcs/prefs/repos)" --description "Darcs repo"'
+set darcs_comp $darcs_comp 'complete -c darcs -a "test predist boringfile binariesfile" -n "contains setpref (commandline -poc)" --description "Set the specified option" -x'
+
+write_completions darcs $darcs_comp >share/completions/darcs.fish

build_tools/make_deb.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Terminate on error
+set -e
+
+sudo rm -Rf /tmp/fishfish
+mkdir /tmp/fishfish
+git archive --format=tar fish_fish | tar -x -C /tmp/fishfish
+mkdir /tmp/fishfish/doc-pak
+cp README INSTALL CHANGELOG release_notes.html /tmp/fishfish/doc-pak/
+cp build_tools/description-pak /tmp/fishfish/
+cd /tmp/fishfish
+autoconf
+./configure
+make -j 3
+sudo checkinstall --default --pakdir ~/fish_built/ --pkgversion 0.9 make install
+mv ~/fish_built/fishfish_0.9-1_i386.deb ~/fish_built/fishfish_0.9_i386.deb
+

build_tools/make_hg_completions.fish

@@ -0,0 +1,8 @@
+#!/usr/bin/env fish
+#
+# This file produces command specific completions for hg. Meant to be executed
+# from the root directory (so the completions get put in the right place).
+
+. build_tools/make_vcs_completions_generic.fish
+
+write_completions hg >share/completions/hg.fish

build_tools/make_macos_pkg.sh

@@ -1,164 +0,0 @@
-#!/usr/bin/env bash
-
-# Script to produce an OS X installer .pkg and .app(.zip)
-
-usage() {
-    echo "Build macOS packages, optionally signing and notarizing them."
-    echo "Usage: $0 options"
-    echo "Options:"
-    echo "  -s                            Enables code signing"
-    echo "  -f <APP_KEY.p12>              Path to .p12 file for application signing"
-    echo "  -i <INSTALLER_KEY.p12>        Path to .p12 file for installer signing"
-    echo "  -p <PASSWORD>                 Password for the .p12 files (necessary to access the certificates)"
-    echo "  -e <entitlements file>        (Optional) Path to an entitlements XML file"
-    echo "  -n                            Enables notarization. This will fail if code signing is not also enabled."
-    echo "  -j <API_KEY.JSON>             Path to JSON file generated with \`rcodesign encode-app-store-connect-api-key\` (required for notarization)"
-    echo
-    exit 1
-}
-
-set -x
-set -e
-
-SIGN=
-NOTARIZE=
-
-ARM64_DEPLOY_TARGET='MACOSX_DEPLOYMENT_TARGET=11.0'
-X86_64_DEPLOY_TARGET='MACOSX_DEPLOYMENT_TARGET=10.12'
-cmake_args=()
-
-while getopts "c:sf:i:p:e:nj:" opt; do
-    case $opt in
-        c) cmake_args+=("$OPTARG");;
-        s) SIGN=1;;
-        f) P12_APP_FILE=$(realpath "$OPTARG");;
-        i) P12_INSTALL_FILE=$(realpath "$OPTARG");;
-        p) P12_PASSWORD="$OPTARG";;
-        e) ENTITLEMENTS_FILE=$(realpath "$OPTARG");;
-        n) NOTARIZE=1;;
-        j) API_KEY_FILE=$(realpath "$OPTARG");;
-        \?) usage;;
-    esac
-done
-
-if [ -n "$SIGN" ] && { [ -z "$P12_APP_FILE" ] || [ -z "$P12_INSTALL_FILE" ] || [ -z "$P12_PASSWORD" ]; }; then
-    usage
-fi
-
-if [ -n "$NOTARIZE" ] && [ -z "$API_KEY_FILE" ]; then
-    usage
-fi
-
-VERSION=$(build_tools/git_version_gen.sh --stdout 2>/dev/null)
-
-echo "Version is $VERSION"
-
-PKGDIR=$(mktemp -d)
-echo "$PKGDIR"
-
-SRC_DIR=$PWD
-OUTPUT_PATH=${FISH_ARTEFACT_PATH:-~/fish_built}
-
-mkdir -p "$PKGDIR/build_x86_64" "$PKGDIR/build_arm64" "$PKGDIR/root" "$PKGDIR/intermediates" "$PKGDIR/dst"
-
-do_cmake() {
-    cmake \
-        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-        -DCMAKE_EXE_LINKER_FLAGS="-Wl,-ld_classic" \
-        -DCMAKE_OSX_ARCHITECTURES='arm64;x86_64' \
-        -DFISH_USE_SYSTEM_PCRE2=OFF \
-        "${cmake_args[@]}" \
-        "$@" \
-        "$SRC_DIR"
-}
-
-# Build and install for arm64.
-# Pass FISH_USE_SYSTEM_PCRE2=OFF because a system PCRE2 on macOS will not be signed by fish,
-# and will probably not be built universal, so the package will fail to validate/run on other systems.
-# Note CMAKE_OSX_ARCHITECTURES is still relevant for the Mac app.
-{ cd "$PKGDIR/build_arm64" \
-    && do_cmake -DRust_CARGO_TARGET=aarch64-apple-darwin \
-    && env $ARM64_DEPLOY_TARGET make VERBOSE=1 -j 12 \
-    && env DESTDIR="$PKGDIR/root/" $ARM64_DEPLOY_TARGET make install;
-}
-
-# Build for x86-64 but do not install; instead we will make a fat binary inside the root.
-{ cd "$PKGDIR/build_x86_64" \
-    && do_cmake -DRust_CARGO_TARGET=x86_64-apple-darwin \
-    && env $X86_64_DEPLOY_TARGET make VERBOSE=1 -j 12; }
-
-# Fatten it up.
-FILE=$PKGDIR/root/usr/local/bin/fish
-X86_FILE=$PKGDIR/build_x86_64/$(basename "$FILE")
-rcodesign macho-universal-create --output "$FILE" "$FILE" "$X86_FILE"
-chmod 755 "$FILE"
-
-if test -n "$SIGN"; then
-    echo "Signing executables"
-    ARGS=(
-        --p12-file "$P12_APP_FILE"
-        --p12-password "$P12_PASSWORD"
-        --code-signature-flags runtime
-        --for-notarization
-    )
-    if [ -n "$ENTITLEMENTS_FILE" ]; then
-        ARGS+=(--entitlements-xml-file "$ENTITLEMENTS_FILE")
-    fi
-    (set +x; rcodesign sign "${ARGS[@]}" "$PKGDIR"/root/usr/local/bin/fish)
-fi
-
-pkgbuild --scripts "$SRC_DIR/build_tools/osx_package_scripts" --root "$PKGDIR/root/" --identifier 'com.ridiculousfish.fish-shell-pkg' --version "$VERSION" "$PKGDIR/intermediates/fish.pkg"
-productbuild  --package-path "$PKGDIR/intermediates" --distribution "$SRC_DIR/build_tools/osx_distribution.xml" --resources "$SRC_DIR/build_tools/osx_package_resources/" "$OUTPUT_PATH/fish-$VERSION.pkg"
-
-if test -n "$SIGN"; then
-    echo "Signing installer"
-    ARGS=(
-        --p12-file "$P12_INSTALL_FILE"
-        --p12-password "$P12_PASSWORD"
-        --code-signature-flags runtime
-        --for-notarization
-    )
-    (set +x; rcodesign sign "${ARGS[@]}" "$OUTPUT_PATH/fish-$VERSION.pkg")
-fi
-
-# Make the app
-(cd "$PKGDIR/build_arm64" && env $ARM64_DEPLOY_TARGET make -j 12 fish_macapp)
-(cd "$PKGDIR/build_x86_64" && env $X86_64_DEPLOY_TARGET make -j 12 fish_macapp)
-
-# Make the app's /usr/local/bin/fish binary universal. Note fish.app/Contents/MacOS/fish already is, courtesy of CMake.
-cd "$PKGDIR/build_arm64"
-FILE=fish.app/Contents/Resources/base/usr/local/bin/fish
-X86_FILE=$PKGDIR/build_x86_64/fish.app/Contents/Resources/base/usr/local/bin/$(basename "$FILE")
-rcodesign macho-universal-create --output "$FILE" "$FILE" "$X86_FILE"
-# macho-universal-create screws up the permissions.
-chmod 755 "$FILE"
-
-if test -n "$SIGN"; then
-    echo "Signing app"
-    ARGS=(
-        --p12-file "$P12_APP_FILE"
-        --p12-password "$P12_PASSWORD"
-        --code-signature-flags runtime
-        --for-notarization
-    )
-    if [ -n "$ENTITLEMENTS_FILE" ]; then
-        ARGS+=(--entitlements-xml-file "$ENTITLEMENTS_FILE")
-    fi
-    (set +x; rcodesign sign "${ARGS[@]}" "fish.app")
-
-fi
-
-cp -R "fish.app" "$OUTPUT_PATH/fish-$VERSION.app"
-cd "$OUTPUT_PATH"
-
-# Maybe notarize.
-if test -n "$NOTARIZE"; then
-    echo "Notarizing"
-    rcodesign notarize --staple --wait --max-wait-seconds 1800 --api-key-file "$API_KEY_FILE" "$OUTPUT_PATH/fish-$VERSION.pkg"
-    rcodesign notarize --staple --wait --max-wait-seconds 1800 --api-key-file "$API_KEY_FILE" "$OUTPUT_PATH/fish-$VERSION.app"
-fi
-
-# Zip it up.
-zip -r "fish-$VERSION.app.zip" "fish-$VERSION.app" && rm -Rf "fish-$VERSION.app"
-
-rm -rf "$PKGDIR"

build_tools/make_pkg.sh

@@ -1 +0,0 @@
-make_macos_pkg.sh

build_tools/make_pkg.sh

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+VERSION=`sed -E -n 's/^.*PACKAGE_VERSION "([0-9.]+)"/\1/p' osx/config.h`
+if test -z "$VERSION" ; then
+  echo "Could not get version from osx/config.h"
+  exit 1
+fi
+
+echo "Version is $VERSION"
+
+set -x
+
+make distclean
+rm -Rf /tmp/fish_pkg
+
+#Exit on error
+set -e
+
+mkdir -p /tmp/fish_pkg/root /tmp/fish_pkg/intermediates /tmp/fish_pkg/dst
+xcodebuild install -scheme install_tree -configuration Release DSTROOT=/tmp/fish_pkg/root/
+pkgbuild --scripts build_tools/osx_package_scripts --root /tmp/fish_pkg/root/ --identifier 'com.ridiculousfish.fish-shell-pkg' --version "$VERSION"  /tmp/fish_pkg/intermediates/fish.pkg
+
+productbuild  --package-path /tmp/fish_pkg/intermediates --distribution build_tools/osx_distribution.xml --resources build_tools/osx_package_resources/ ~/fish_built/fish.pkg

build_tools/make_svn_completions.fish

@@ -0,0 +1,8 @@
+#!/usr/bin/env fish
+#
+# This file produces command specific completions for svn. Meant to be executed
+# from the root directory (so the completions get put in the right place).
+
+. build_tools/make_vcs_completions_generic.fish
+
+write_completions svn >share/completions/svn.fish

build_tools/make_tarball.sh

@@ -1,23 +1,46 @@
 #!/bin/sh
 
 # Script to generate a tarball
-# Outputs to $FISH_ARTEFACT_PATH or ~/fish_built by default
+# We use git to output a tree. But we also want to build the user documentation
+# and put that in the tarball, so that nobody needs to have doxygen installed
+# to build it.
 
 # Exit on error
 set -e
 
-# Get the version
-VERSION=$(build_tools/git_version_gen.sh --stdout 2>/dev/null)
+# We wil generate a tarball with a prefix "fish"
+# git can do that automatically for us via git-archive
+# but to get the documentation in, we need to make a symlink called "fish"
+# and tar from that, so that the documentation gets the right prefix
 
-prefix=fish-$VERSION
-path=${FISH_ARTEFACT_PATH:-~/fish_built}/$prefix.tar.xz
+# Get the current directory, which we'll use for symlinks
+wd="$PWD"
 
-git archive \
-    --prefix="$prefix/" \
-    --add-virtual-file="$prefix/version:$VERSION" \
-    HEAD |
-    xz >"$path"
+# The name of the prefix, which is the directory that you get when you untar
+prefix="fish"
 
-# Output what we did, and the sha256 hash
-echo "Tarball written to $path"
-openssl dgst -sha256 "$path"
+# The path where we will output the tar file
+path=~/fish_built/fish-2.0.tar
+
+# Clean up stuff we've written before
+rm -f "$path" "$path".gz
+
+# git starts the archive
+git archive --format=tar --prefix="$prefix"/ master > "$path"
+
+# tarball out the documentation
+make user_doc
+make share/man
+cd /tmp
+rm -f "$prefix"
+ln -s "$wd" "$prefix"
+tar --append --file="$path" "$prefix"/user_doc/html
+tar --append --file="$path" "$prefix"/share/man
+rm -f "$prefix"
+
+# gzip it
+gzip "$path"
+
+# Output what we did, and the sha1 hash
+echo "Tarball written to $path".gz
+openssl sha1 "$path".gz

build_tools/make_vcs_completions.fish

@@ -0,0 +1,9 @@
+#!/usr/bin/env fish
+#
+# This file produces command specific completions for hg, darcs and a
+# few other vcs systems.
+
+build_tools/make_darcs_completions.fish
+build_tools/make_hg_completions.fish
+build_tools/make_svn_completions.fish
+build_tools/make_csv_completions.fish

build_tools/make_vcs_completions_generic.fish

@@ -0,0 +1,229 @@
+#!/usr/bin/env fish
+#
+# This file provides generic functions for generating specific completions for 
+# hg, darcs and a few other vcs systems. It uses the fact that all these 
+# systems have a somewhat uniform command line help mechanism.
+#
+
+function cap
+	set res (echo $argv |cut -c 1|tr a-z A-Z)(echo $argv |cut -c 2-)
+	echo $res
+end
+
+#
+# Escapes the single quote (') character and removes trailing whitespace from $argv
+#
+
+function esc
+	echo $argv | sed -e "s/\(['\\\]\)/\\\\\1/g" | sed -e 's/ *$//' | sed -e 's/     .*//'
+end
+
+
+#
+# This function formats a list of completion information into a set of fish completions
+#
+# The first argument is the condition string, which will be copied to
+# the resulting commandline verbatim
+#
+# Remaining arguments are tab separated lists of completion
+# information. Each list contains four elements, the short switch, the
+# long switch, the argument and the description.
+#
+
+function complete_from_list
+
+	set condition $argv[1]
+	set -e argv[1]
+
+	for j in $argv
+		set exploded (echo $j|tr \t \n)
+		set short $exploded[1]
+		set long $exploded[2]
+		set arg $exploded[3]
+		set desc (cap (esc $exploded[4]))
+
+		set str
+
+		switch $short
+			case '-?'
+				set str $str -s (printf "%s\n" $short|cut -c 2)
+		end
+
+		switch $long
+			case '--?*'
+				set str $str -l (printf "%s\n" $long|cut -c 3-)
+		end
+
+		switch $arg
+			case '=DIRECTORY' ' dir'
+				set str $str -x -a "'(__fish_complete_directories (commandline -ct))'"
+
+			case '=COMMAND'
+				set str $str -x -a "'(__fish_complete_command)'"
+
+			case '=USERNAME' ' <user>'
+				set str $str -x -a "'(__fish_complete_users)'"
+
+			case '=FILENAME' '=FILE' ' <file>'
+				set str $str -r
+
+			case ' arg'
+				set str $str -x
+
+			case ' (*):'
+				 set str $str -x -a \'(echo $arg| sed -e "s/ (\(.*\)):/\1/" |tr '/' ' ')\'
+
+			case '?*'
+				set str $str -x
+				if not set -q unknown
+					set -g unknown
+				end
+				if not contains $arg $unknown
+					echo "Don't know how to handle arguments of type '$arg'" >&2
+					set unknown $unknown $arg
+				end
+		end
+
+		switch $desc
+			case '?*'
+				set str $str --description \'$desc\'
+		end
+
+		echo complete -c $cmd $condition $str
+
+	end
+
+end
+
+
+function write_completions
+
+	set -g cmd $argv[1]; or return 1
+
+	echo "Making completions for $cmd" >&2
+
+
+	echo '
+#
+# Completions for the '$cmd' command
+# This file was autogenerated by the file make_vcs_completions.fish
+# which is shipped with the fish source code.
+#
+
+#
+# Completions from commandline
+#
+'
+	set -e argv[1]
+
+	while count $argv >/dev/null
+		echo $argv[1]
+		set -e argv[1]
+	end
+
+
+	eval "function cmd; $cmd \$argv; end"
+
+	set -l cmd_str
+
+	switch $cmd
+		case svn
+
+		function list_subcommand
+			set cmd1 '\([^ ]*\)'
+			set cmd2 '\([^,)]*\)'
+			set cmdn '\(, \([^,)]*\)\|\)'
+			set svn_re '^    *'$cmd1'\( ('$cmd2$cmdn$cmdn')\|\).*$'
+			cmd help|sed -ne 's/'$svn_re'/\1\n\3\n\5\n\7/p'| grep .
+		end
+
+		function list_subcommand_help
+			set short_exp '\(-.\|\)'
+			set long_exp '\(--[^ =,]*\)'
+			set arg_exp '\(\|[= ][^ ][^ ]*\)'
+			set desc_exp '\([\t ]*:[\t ]*\|\)\([^ ].*[^.]\)'
+			set re "^ *$short_exp  *$long_exp$arg_exp  *$desc_exp\(\|\\.\)\$"
+			cmd help $argv | sed -n -e 's/'$re'/\1\t\2\t\3\t\5/p'
+		end
+
+		for i in (list_subcommand)
+
+			set desc (cmd help $i|head -n 3| sed -e 's/usage:.*//'| tr \n \ | sed -e 's/[^:]*: *\(.*[^.]\)\(\|\\.\)$/\1/')
+			set desc (esc $desc)
+			set cmd_str $cmd_str "-a $i --description '$desc'"
+		end
+
+		case cvs
+
+		function list_subcommand
+			cmd --help-commands 2>| sed -n -e 's/^   *\([^ ][^ ]*\) .*$/\1/p'
+		end
+
+		set short_exp '\(-.\)'
+		set arg_exp '\(\| [^ \t][^ \t]*\)'
+		set desc_exp '\([\t ]*:[\t ]*\|\)\([^ ].*\)'
+		set -g re '^[ \t]*'$short_exp$arg_exp'[ \t]*'$desc_exp'$'
+
+		function list_subcommand_help
+#'s/^[ \t]*\(-.\)[ \t]\([^- \t][^ \t]*\)*[ \t]*\([^-].*\)$/\1\t\2\t\3/p'
+
+			cmd -H $argv 2>| sed -n -e 's/'$re'/\1\t\t\2\t\4/p'
+		end
+
+		echo '
+#
+# Global switches
+#
+'
+
+		complete_from_list "-n '__fish_use_subcommand'" (cmd --help-options 2>| sed -n -e 's/'$re'/\1\t\t\2\t\4/p')
+
+		set cmd_str_internal (cmd --help-commands 2>| sed -n -e 's/^  *\([^ ][^ ]*\)[\t ]*\([^ ].*\)$/\1\t\2/p')
+		for i in $cmd_str_internal
+			set exploded (echo $i|tr \t \n)
+			set cmd_str $cmd_str "-a $exploded[1] --description '"(esc $exploded[2])"'"
+		end
+
+		case '*'
+
+		function list_subcommand
+			cmd help | sed -n -e 's/^  *\([^ ][^ ]*\) .*$/\1/p'
+		end
+
+		function list_subcommand_help
+			set -l short_exp '\(-.\|\)\( [^ -][^ ]*\|\)'
+			set -l long_exp '\(--[^ =,]*\)'
+			set -l arg_exp '\(\|[= ][^ ][^ ]*\)'
+			set -l desc_exp '\([\t ]*:[\t ]*\|\)\([^ ].*[^.]\)'
+			set -l re "^ *$short_exp  *$long_exp$arg_exp  *$desc_exp\(\|\\.\)\$"
+
+			cmd help $argv | sed -n -e 's/'$re'/\1\t\3\t\4\t\6/p'
+		end
+
+		set cmd_str (cmd help | sed -n -e 's/^  *\([^ ][^ ]*\)[\t ]*\([^ ].*[^.]\)\(\|\\.\)$/-a \1 --description \'\2\'/p')
+
+	end
+
+	echo '
+#
+# subcommands
+#
+'
+
+	printf "complete -c $cmd -n '__fish_use_subcommand' -x %s\n" $cmd_str
+
+	for i in (list_subcommand)
+
+		echo '
+
+#
+# Completions for the \''$i'\' subcommand
+#
+'
+
+		complete_from_list "-n 'contains \\'$i\\' (commandline -poc)'" (list_subcommand_help $i)
+	end
+
+	echo \n\n
+
+end

build_tools/make_vendor_tarball.sh

@@ -1,55 +0,0 @@
-#!/bin/sh
-
-# Script to generate a tarball of vendored (downloaded) Rust dependencies
-# and the cargo configuration to ensure they are used
-# This tarball should be unpacked into a fish source directory
-# Outputs to $FISH_ARTEFACT_PATH or ~/fish_built by default
-
-# Exit on error
-set -e
-
-# We need GNU tar as that supports the --mtime and --transform options
-TAR=notfound
-for try in tar gtar gnutar; do
-    if $try -Pcf /dev/null --mtime now /dev/null >/dev/null 2>&1; then
-        TAR=$try
-        break
-    fi
-done
-
-if [ "$TAR" = "notfound" ]; then
-    echo 'No suitable tar (supporting --mtime) found as tar/gtar/gnutar in PATH'
-    exit 1
-fi
-
-# Get the current directory, which we'll use for telling Cargo where to find the sources
-wd="$PWD"
-
-# Get the version from git-describe
-VERSION=$(build_tools/git_version_gen.sh --stdout 2>/dev/null)
-
-# The name of the prefix, which is the directory that you get when you untar
-prefix="fish-$VERSION"
-
-# The path where we will output the tar file
-# Defaults to ~/fish_built
-path=${FISH_ARTEFACT_PATH:-~/fish_built}/$prefix-vendor.tar
-
-# Clean up stuff we've written before
-rm -f "$path" "$path".xz
-
-# Work in a temporary directory to avoid clobbering the source directory
-PREFIX_TMPDIR=$(mktemp -d)
-cd "$PREFIX_TMPDIR"
-
-mkdir .cargo
-cargo vendor --manifest-path "$wd/Cargo.toml" > .cargo/config.toml
-
-tar cfvJ "$path".xz vendor .cargo
-
-cd -
-rm -r "$PREFIX_TMPDIR"
-
-# Output what we did, and the sha256 hash
-echo "Tarball written to $path".xz
-openssl dgst -sha256 "$path".xz

build_tools/osx_distribution.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <installer-gui-script minSpecVersion="1">
     <title>fish shell</title>
-    <welcome file="welcome.html" mime-type="text/html"/>
+    <welcome file="welcome.rtf"/>
     <background file="terminal_logo.png" scaling="proportional" alignment="bottomleft"/>
     <pkg-ref id="com.ridiculousfish.fish-shell-pkg"/>
-    <options hostArchitectures="arm64,x86_64" rootVolumeOnly="true"/>
-    <options customize="never" require-scripts="true"/>
+    <options customize="never" require-scripts="false"/>
     <choices-outline>
         <line choice="default">
             <line choice="com.ridiculousfish.fish-shell-pkg"/>

build_tools/osx_package_resources/welcome.html

@@ -1,28 +0,0 @@
-<html>
-	<head>
-		<style>
-			body {
-				font-family: system-ui, -apple-system, "Helvetica Neue", sans-serif;
-				font-size: 10pt;
-			}
-			code, tt {
-				font-family: ui-monospace, Menlo, monospace;
-			}
-		</style>
-	</head>
-	<body>
-	<p>
-		<strong>fish</strong> is a smart and user-friendly command line shell. For more information, visit <a href="https://fishshell.com">fishshell.com</a>.
-	</p>
-	<p>
-		<strong>fish</strong> will be installed into <tt>/usr/local/</tt>, and its path will be added to <wbr><tt>/etc/shells</tt> if necessary.
-	</p>
-	<p>
-		Your default shell will <em>not</em> be changed. To make <strong>fish</strong> your login shell after the installation, run:
-	</p>
-	<p>
-	<code>chsh -s /usr/local/bin/fish</code>
-	</p>
-	<p>Enjoy! Bugs can be reported on <a href="https://github.org/fish-shell/fish-shell/">GitHub</a>.</p>
-	</body>
-</html>

build_tools/osx_package_resources/welcome.rtf

@@ -0,0 +1,25 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset0 Monaco;}
+{\colortbl;\red255\green255\blue255;}
+{\info
+{\author dlkfjslfjsfdlkfk}}\margl1440\margr1440\vieww10800\viewh8400\viewkind0
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
+
+\f0\fs30 \cf0 The fish shell is a smart and user friendly command line shell. For more information, visit {\field{\*\fldinst{HYPERLINK "http://fishshell.com"}}{\fldrslt http://fishshell.com}}.\
+\
+fish will be installed into
+\f1\fs26 /usr/local/
+\f0\fs30 , and fish will be added to
+\f1\fs26 /etc/shells
+\f0\fs30  if necessary.\
+\
+Your default shell will 
+\i not
+\i0  be changed. To make fish your default, run:\
+\
+
+\f1 chsh -s /usr/local/bin/fish
+\f0 \
+\
+Enjoy!\
+}

build_tools/osx_package_scripts/add-shell

@@ -4,12 +4,12 @@
 
 if test $# -eq 0
 then
-	echo "usage: $0 shellname [shellname ...]"
+	echo usage: $0 shellname [shellname ...]
 	exit 1
 fi
 
-scriptname=$(basename "$0")
-if [ "$(id -u)" -ne 0 ]; then
+scriptname=`basename "$0"`
+if [[ $UID -ne 0 ]]; then
      echo "${scriptname} must be run as root"
      exit 1
 fi
@@ -20,7 +20,6 @@ tmpfile=${file}.tmp
 
 set -o noclobber
 
-# shellcheck disable=SC2064
 trap "rm -f $tmpfile" EXIT
 
 if ! cat $file > $tmpfile
@@ -33,13 +32,15 @@ EOF
 fi
 
 # Append a newline if it doesn't exist
-[ -z "$(tail -c1 "$tmpfile")" ] || echo "" >> "$tmpfile"
+if [ "$(tail -c1 "$tmpfile"; echo x)" != $'\nx' ]; then
+    echo "" >> "$tmpfile"
+fi
 
 for i
 do
         if ! grep -q "^${i}$" "$tmpfile"
         then
-                echo "$i" >> "$tmpfile"
+                echo $i >> "$tmpfile"
         fi
 done
 

build_tools/osx_package_scripts/postinstall

@@ -1,3 +1,3 @@
 #!/bin/sh -x
 
-./add-shell "${DSTVOLUME}"usr/local/bin/fish
+./add-shell /usr/local/bin/fish > /tmp/fish_postinstall_output.log

build_tools/osx_package_scripts/preinstall

@@ -1,7 +0,0 @@
-#!/bin/sh -x
-
-echo "Removing any previous installation"
-pkgutil --pkg-info "${INSTALL_PKG_SESSION_ID}" && pkgutil --only-files --files "${INSTALL_PKG_SESSION_ID}" | while read -r installed
-     do rm -v "${DSTVOLUME}${installed}"
-done
-echo "... removed"

build_tools/release-notes.sh

@@ -1,110 +0,0 @@
-#!/bin/sh
-
-set -e
-
-workspace_root=$(dirname "$0")/..
-
-relnotes_tmp=$(mktemp -d)
-mkdir -p "$relnotes_tmp/fake-workspace" "$relnotes_tmp/out"
-(
-    cd "$workspace_root"
-    cp -r doc_src CONTRIBUTING.rst README.rst "$relnotes_tmp/fake-workspace"
-)
-version=$(sed 's,^fish \(\S*\) .*,\1,; 1q' "$workspace_root/CHANGELOG.rst")
-add_stats=false
-# Skip on shallow clone (CI) for now.
-if test -z "$CI" || [ "$(git -C "$workspace_root" tag | wc -l)" -gt 1 ]; then {
-    previous_version=$(
-        cd "$workspace_root"
-        git for-each-ref --format='%(objecttype) %(refname:strip=2)' refs/tags |
-            awk '/tag/ {print $2}' | sort --version-sort |
-            grep -vxF "$(git describe)" | tail -1
-    )
-    minor_version=${version%.*}
-    previous_minor_version=${previous_version%.*}
-    if [ "$minor_version" != "$previous_minor_version" ]; then
-        add_stats=true
-    fi
-} fi
-{
-    sed -n 1,2p <"$workspace_root/CHANGELOG.rst"
-    if $add_stats; then {
-        ExtractCommitters() {
-            git log "$1" --format="%aN"
-            trailers='Co-authored-by|Signed-off-by'
-            git log "$1" --format="%b" | sed -En "/^($trailers):\s*/{s///;s/\s*<.*//;p}"
-        }
-        ListCommitters() {
-            comm "$@" "$relnotes_tmp/committers-then" "$relnotes_tmp/committers-now"
-        }
-        (
-            cd "$workspace_root"
-            ExtractCommitters "$previous_version" | sort -u >"$relnotes_tmp/committers-then"
-            ExtractCommitters "$previous_version".. | sort -u >"$relnotes_tmp/committers-now"
-            ListCommitters -13 >"$relnotes_tmp/committers-new"
-            ListCommitters -12 >"$relnotes_tmp/committers-returning"
-            num_commits=$(git log --no-merges --format=%H "$previous_version".. | wc -l)
-            num_authors=$(wc -l <"$relnotes_tmp/committers-now")
-            num_new_authors=$(wc -l <"$relnotes_tmp/committers-new")
-            printf %s \
-                "This release comprises $num_commits commits since $previous_version," \
-                " contributed by $num_authors authors, $num_new_authors of which are new committers."
-            echo
-            echo
-        )
-    } fi
-
-    printf '%s\n' "$(awk <"$workspace_root/CHANGELOG.rst" '
-        NR <= 2 || /^\.\. ignore / { next }
-        /^===/ { exit }
-        { print }
-    ' | sed '$d')" |
-        sed -e '$s/^----*$//' # Remove spurious transitions at the end of the document.
-
-    if $add_stats; then {
-        JoinEscaped() {
-            LC_CTYPE=C.UTF-8 sed 's/\S/\\&/g' |
-                awk '
-                    NR != 1 { printf ",\n" }
-                    { printf "%s", $0 }
-                    END { printf "\n" }
-                '
-        }
-        echo ""
-        echo "---"
-        echo ""
-        echo "Thanks to everyone who contributed through issue discussions, code reviews, or code changes."
-        echo
-        printf "Welcome our new committers: "
-        JoinEscaped <"$relnotes_tmp/committers-new"
-        echo
-        printf "Welcome back our returning committers: "
-        JoinEscaped <"$relnotes_tmp/committers-returning"
-    } fi
-    echo
-    echo "---"
-    echo
-    echo 'Download links:'
-    echo 'To download the source code for fish, we suggest the file named ``fish-'"$version"'.tar.xz``.'
-    echo 'The file downloaded from ``Source code (tar.gz)`` will not build correctly.'
-    echo 'A GPG signature using `this key <'"${FISH_GPG_PUBLIC_KEY_URL:-???}"'>`__ is available as ``fish-'"$version"'.tar.xz.asc``.'
-    echo
-    echo 'The files called ``fish-'"$version"'-linux-*.tar.xz`` contain'
-    echo '`standalone fish binaries <https://github.com/fish-shell/fish-shell/?tab=readme-ov-file#building-fish-with-cargo>`__'
-    echo 'for any Linux with the given CPU architecture.'
-} >"$relnotes_tmp/fake-workspace"/CHANGELOG.rst
-
-sphinx-build >&2 -j auto \
-    -W -E -b markdown -c "$workspace_root/doc_src" \
-    -d "$relnotes_tmp/doctree" "$relnotes_tmp/fake-workspace/doc_src" "$relnotes_tmp/out" \
-    -D markdown_http_base="https://fishshell.com/docs/$minor_version" \
-    -D markdown_uri_doc_suffix=".html" \
-    -D markdown_flavor=github \
-    "$@"
-
-# Skip changelog header
-sed -n 1p "$relnotes_tmp/out/relnotes.md" | grep -Fxq "# Release notes"
-sed -n 2p "$relnotes_tmp/out/relnotes.md" | grep -Fxq ''
-sed 1,2d "$relnotes_tmp/out/relnotes.md"
-
-rm -r "$relnotes_tmp"

build_tools/release.sh

@@ -1,311 +0,0 @@
-#!/bin/sh
-
-{
-
-set -ex
-
-version=$1
-repository_owner=fish-shell
-remote=origin
-if [ -n "$2" ]; then
-    set -u
-    repository_owner=$2
-    remote=$3
-    set +u
-    [ $# -eq 3 ]
-fi
-
-[ -n "$version" ]
-
-for tool in \
-    cmake \
-    bundle \
-    diff \
-    gh \
-    gpg \
-    jq \
-    ninja \
-    ruby \
-    tar \
-    timeout \
-    uv \
-    xz \
-; do
-    if ! command -v "$tool" >/dev/null; then
-        echo >&2 "$0: missing command: $1"
-        exit 1
-    fi
-done
-
-committer=$(git var GIT_AUTHOR_IDENT)
-committer=${committer% *} # strip timezone
-committer=${committer% *} # strip timestamp
-gpg --local-user="$committer" --sign </dev/null >/dev/null
-
-repo_root="$(dirname "$0")/.."
-fish_site=$repo_root/../fish-site
-fish_site_repo=git@github.com:$repository_owner/fish-site
-
-for path in . "$fish_site"
-do
-    if ! git -C "$path" diff HEAD --quiet ||
-        git ls-files --others --exclude-standard | grep .; then
-        echo >&2 "$0: index and worktree must be clean"
-        exit 1
-    fi
-done
-
-(
-    cd "$fish_site"
-    [ "$(git rev-parse HEAD)" = \
-        "$(git ls-remote "$fish_site_repo" refs/heads/master |
-            awk '{print $1}')" ]
-)
-
-if git tag | grep -qxF "$version"; then
-    echo >&2 "$0: tag $version already exists"
-    exit 1
-fi
-
-integration_branch=$(
-    git for-each-ref --points-at=HEAD 'refs/heads/Integration_*' \
-        --format='%(refname:strip=2)'
-)
-[ -n "$integration_branch" ] ||
-    git merge-base --is-ancestor $remote/master HEAD
-
-sed -n 1p CHANGELOG.rst | grep -q '^fish .*(released .*)$'
-sed -n 2p CHANGELOG.rst | grep -q '^===*$'
-
-changelog_title="fish $version (released $(date +'%B %d, %Y'))"
-sed -i \
-    -e "1c$changelog_title" \
-    -e "2c$(printf %s "$changelog_title" | sed s/./=/g)" \
-    CHANGELOG.rst
-
-CommitVersion() {
-    sed -i "s/^version = \".*\"/version = \"$1\"/g" Cargo.toml
-    cargo fetch --offline
-    if [ "$1" = "$version" ]; then
-        # debchange is a Debian script to manage the Debian changelog, but
-        # it's too annoying to install everywhere. Just do it by hand.
-        cat - contrib/debian/changelog > contrib/debian/changelog.new <<EOF
-fish (${version}-1) stable; urgency=medium
-
-  * Release of new version $version.
-
-  See https://github.com/fish-shell/fish-shell/releases/tag/$version for details.
-
- -- $committer  $(date -R)
-
-EOF
-        mv contrib/debian/changelog.new contrib/debian/changelog
-        git add contrib/debian/changelog
-    fi
-    git add CHANGELOG.rst Cargo.toml Cargo.lock
-    git commit -m "$2
-
-Created by ./build_tools/release.sh $version"
-}
-
-CommitVersion "$version" "Release $version"
-
-git -c "user.signingKey=$committer" \
-    tag --sign --message="Release $version" $version
-
-git push $remote $version
-
-TIMEOUT=
-gh() {
-    command ${TIMEOUT:+timeout $TIMEOUT} \
-        gh --repo "$repository_owner/fish-shell" "$@"
-}
-
-gh workflow run release.yml --ref="$version" \
-    --raw-field="version=$version"
-
-run_id=
-while [ -z "$run_id" ] && sleep 5
-do
-    run_id=$(gh run list \
-                --json=databaseId --jq=.[].databaseId \
-                --workflow=release.yml --limit=1 \
-                --commit="$(git rev-parse "$version^{commit}")")
-done
-
-# Update fishshell.com
-tag_oid=$(git rev-parse "$version")
-tmpdir=$(mktemp -d)
-fish_tar_xz=fish-$version.tar.xz
-(
-    local_tarball=$tmpdir/local-tarball
-    mkdir "$local_tarball"
-    FISH_ARTEFACT_PATH=$local_tarball ./build_tools/make_tarball.sh
-    cd "$local_tarball"
-    tar xf "$fish_tar_xz"
-)
-# TODO This works on draft releases only if "gh" is configured to
-# have write access to the fish-shell repository. Unless we are fine
-# publishing the release at this point, we should at least fail if
-# "gh" doesn't have write access.
-while ! \
-    gh release download "$version" --dir="$tmpdir" \
-        --pattern="$fish_tar_xz"
-do
-    TIMEOUT=30 gh run watch "$run_id" ||:
-    sleep 5
-done
-actual_tag_oid=$(git ls-remote "$remote" |
-    awk '$2 == "refs/tags/'"$version"'" { print $1 }')
-[ "$tag_oid" = "$actual_tag_oid" ]
-
-(
-    cd "$tmpdir"
-    tar xf "$fish_tar_xz"
-    diff -ur "fish-$version" "local-tarball/fish-$version"
-    gpg --local-user="$committer" --sign --detach --armor \
-        "$fish_tar_xz"
-    gh release upload "$version" "$fish_tar_xz.asc"
-)
-
-(
-    cd "$tmpdir/local-tarball/fish-$version"
-    uv --no-managed-python venv
-    . .venv/bin/activate
-    cmake -GNinja -DCMAKE_BUILD_TYPE=Debug .
-    ninja doc
-)
-CopyDocs() {
-    rm -rf "$fish_site/site/docs/$1"
-    cp -r "$tmpdir/local-tarball/fish-$version/user_doc/html" "$fish_site/site/docs/$1"
-    git -C $fish_site add "site/docs/$1"
-}
-minor_version=${version%.*}
-CopyDocs "$minor_version"
-latest_release=$(
-    releases=$(git tag | grep '^[0-9]*\.[0-9]*\.[0-9]*.*' |
-        sed $(: "De-prioritize release candidates (1.2.3-rc0)") \
-        's/-/~/g' | LC_ALL=C sort --version-sort)
-    printf %s\\n "$releases" | tail -1
-)
-if [ "$version" = "$latest_release" ]; then
-    CopyDocs current
-fi
-rm -rf "$tmpdir"
-(
-    cd "$fish_site"
-    make
-    git add -u
-    git add docs
-    if git ls-files --others --exclude-standard | grep .; then
-        exit 1
-    fi
-    git commit --message="$(printf %s "\
-        | Release $version (docs)
-        |
-        | Created by ../fish-shell/build_tools/release.sh
-    " | sed 's,^\s*| \?,,')"
-)
-
-gh_api_repo() {
-    path=$1
-    shift
-    command gh api \
-        -H "Accept: application/vnd.github+json" \
-        -H "X-GitHub-Api-Version: 2022-11-28" \
-        "/repos/$repository_owner/fish-shell/$path" \
-        "$@"
-}
-
-# Approve macos-codesign
-# TODO what if current user can't approve?
-gh_pending_deployments() {
-    gh_api_repo "actions/runs/$run_id/pending_deployments" "$@"
-}
-while {
-    environment_id=$(gh_pending_deployments | jq .[].environment.id)
-    [ -z "$environment_id" ]
-}
-do
-    sleep 5
-done
-echo '
-        {
-            "environment_ids": ['"$environment_id"'],
-            "state": "approved",
-            "comment": "Approved via ./build_tools/release.sh"
-        }
-    ' |
-gh_pending_deployments --method POST --input=-
-
-# Await completion.
-gh run watch "$run_id"
-
-while {
-    ! draft=$(gh release view "$version" --json=isDraft --jq=.isDraft) \
-    || [ "$draft" = true ]
-}
-do
-    sleep 20
-done
-
-(
-    cd "$fish_site"
-    make new-release
-    git add -u
-    git add docs
-    if git ls-files --others --exclude-standard | grep .; then
-        exit 1
-    fi
-    git commit --message="$(printf %s "\
-        | Release $version (release list update)
-        |
-        | Created by ../fish-shell/build_tools/release.sh
-    " | sed 's,^\s*| \?,,')"
-    # This takes care to support remote names that are different from
-    # fish-shell remote name. Also, support detached HEAD state.
-    git push "$fish_site_repo" HEAD:master
-    git fetch "$fish_site_repo" \
-        "$(git rev-parse HEAD):refs/remotes/origin/master"
-)
-
-if [ -n "$integration_branch" ]; then {
-    git push $remote "$version^{commit}":refs/heads/$integration_branch
-} else {
-    changelog=$(cat - CHANGELOG.rst <<EOF
-fish ?.?.? (released ???)
-=========================
-
-EOF
-    )
-    printf %s\\n "$changelog" >CHANGELOG.rst
-    CommitVersion ${version}-snapshot "start new cycle"
-    git push $remote HEAD:master
-} fi
-
-milestone_version="$(
-    if echo "$version" | grep -q '\.0$'; then
-        echo "$minor_version"
-    else
-        echo "$version"
-    fi
-)"
-milestone_number() {
-    gh_api_repo milestones?state=open |
-        jq --arg name "fish $1" '
-            .[] | select(.title == $name) | .number
-        '
-}
-gh_api_repo milestones/"$(milestone_number "$milestone_version")" \
-    --method PATCH --raw-field state=closed
-
-next_minor_version=$(echo "$minor_version" |
-    awk -F. '{ printf "%s.%s", $1, $2+1 }')
-if [ -z "$(milestone_number "$next_minor_version")" ]; then
-    gh_api_repo milestones --method POST \
-        --raw-field title="fish $next_minor_version"
-fi
-
-exit
-
-}

build_tools/style.fish

@@ -1,123 +0,0 @@
-#!/usr/bin/env fish
-#
-# This runs Python files, fish scripts (*.fish), and Rust files
-# through their respective code formatting programs.
-#
-# `--all`: Format all eligible files instead of the ones specified as arguments.
-# `--check`: Instead of reformatting, fail if a file is not formatted correctly.
-# `--force`: Proceed without asking if uncommitted changes are detected.
-#            Only relevant if `--all` is specified but `--check` is not specified.
-
-set -l fish_files
-set -l python_files
-set -l rust_files
-set -l all no
-
-argparse all check force -- $argv
-or exit $status
-
-if set -l -q _flag_all
-    set all yes
-    if set -q argv[1]
-        echo "Unexpected arguments: '$argv'"
-        exit 1
-    end
-end
-
-set -l workspace_root (status dirname)/..
-
-if test $all = yes
-    if not set -l -q _flag_force; and not set -l -q _flag_check
-        # Potential for false positives: Not all fish files are formatted, see the `fish_files`
-        # definition below.
-        set -l relevant_uncommitted_changes (git status --porcelain --short --untracked-files=all | sed -e 's/^ *[^ ]* *//' | grep -E '.*\.(fish|py|rs)$')
-        if set -q relevant_uncommitted_changes[1]
-            for changed_file in $relevant_uncommitted_changes
-                echo $changed_file
-            end
-            echo
-            echo 'You have uncommitted changes (listed above). Are you sure you want to restyle?'
-            read -P 'y/N? ' -n1 -l ans
-            if not string match -qi y -- $ans
-                exit 1
-            end
-        end
-    end
-    set fish_files $workspace_root/{benchmarks,build_tools,etc,share}/**.fish
-    set python_files $workspace_root
-else
-    # Format the files specified as arguments.
-    set -l files $argv
-    set fish_files (string match -r '^.*\.fish$' -- $files)
-    set python_files (string match -r '^.*\.py$' -- $files)
-    set rust_files (string match -r '^.*\.rs$' -- $files)
-end
-
-set -l red (set_color red)
-set -l green (set_color green)
-set -l yellow (set_color yellow)
-set -l normal (set_color normal)
-
-function die -V red -V normal
-    echo $red$argv[1]$normal
-    exit 1
-end
-
-if set -q fish_files[1]
-    if not type -q fish_indent
-        echo
-        echo $yellow'Could not find `fish_indent` in `$PATH`.'$normal
-        exit 127
-    end
-    echo === Running "$green"fish_indent"$normal"
-    if set -l -q _flag_check
-        fish_indent --check -- $fish_files
-        or die "Fish files are not formatted correctly."
-    else
-        fish_indent -w -- $fish_files
-    end
-end
-
-if set -q python_files[1]
-    if not type -q ruff
-        echo
-        echo $yellow'Please install `ruff` to style python'$normal
-        exit 127
-    end
-    echo === Running "$green"ruff format"$normal"
-    if set -l -q _flag_check
-        ruff format --check $python_files
-        or die "Python files are not formatted correctly."
-    else
-        ruff format $python_files
-    end
-end
-
-if test $all = yes; or set -q rust_files[1]
-    if not cargo fmt --version >/dev/null
-        echo
-        echo $yellow'Please install "rustfmt" to style Rust, e.g. via:'
-        echo "rustup component add rustfmt"$normal
-        exit 127
-    end
-
-    set -l edition_spec string match -r '^edition\s*=.*'
-    test "$($edition_spec <Cargo.toml)" = "$($edition_spec <.rustfmt.toml)"
-    or die "Cargo.toml and .rustfmt.toml use different editions"
-
-    echo === Running "$green"rustfmt"$normal"
-    if set -l -q _flag_check
-        if test $all = yes
-            cargo fmt --all --check
-        else
-            rustfmt --check --files-with-diff $rust_files
-        end
-        or die "Rust files are not formatted correctly."
-    else
-        if test $all = yes
-            cargo fmt --all
-        else
-            rustfmt $rust_files
-        end
-    end
-end

build_tools/supported_ubuntu_versions.py

@@ -1,22 +0,0 @@
-# /// script
-# requires-python = ">=3.5"
-# dependencies = [
-#     "launchpadlib",
-# ]
-# ///
-
-from launchpadlib.launchpad import Launchpad
-
-if __name__ == "__main__":
-    launchpad = Launchpad.login_anonymously(
-        "fish shell build script", "production", "~/.cache", version="devel"
-    )
-    ubu = launchpad.projects("ubuntu")
-    print(
-        "\n".join(
-            x["name"]
-            for x in ubu.series.entries
-            if x["supported"] == True
-            and x["name"] not in ("trusty", "xenial", "bionic", "focal")
-        )
-    )

build_tools/update-dependencies.sh

@@ -1,34 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-command -v curl
-command -v gcloud
-command -v jq
-command -v rustup
-command -v updatecli
-command -v uv
-sort --version-sort </dev/null
-
-# TODO This is copied from .github/actions/install-sphinx/action.yml
-uv lock --check --exclude-newer="$(awk -F'"' <uv.lock '/^exclude-newer[[:space:]]*=/ {print $2}')"
-
-updatecli "${@:-apply}"
-
-uv lock # Python version constraints may have changed.
-uv lock --upgrade --exclude-newer="$(date --date='7 days ago' --iso-8601)"
-
-from_gh() {
-    repo=$1
-    path=$2
-    out_dir=$3
-    contents=$(curl -fsS https://raw.githubusercontent.com/"${repo}"/refs/heads/master/"${path}")
-    printf '%s\n' >"$out_dir/$(basename "$path")" "$contents"
-}
-from_gh ridiculousfish/widecharwidth widechar_width.rs crates/widecharwidth/src/
-from_gh ridiculousfish/littlecheck littlecheck/littlecheck.py tests/
-
-# Update Cargo.lock
-cargo update
-# Update Cargo.toml and Cargo.lock
-cargo +nightly -Zunstable-options update --breaking

build_tools/update_translations.fish

@@ -1,156 +0,0 @@
-#!/usr/bin/env fish
-
-# Updates the files used for gettext translations.
-# By default, the whole xgettext + msgmerge pipeline runs,
-# which extracts the messages from the source files into $template_file,
-# and updates the PO files for each language from that.
-#
-# Use cases:
-# For developers:
-#   - Run with no args to update all PO files after making changes to Rust/fish sources.
-# For translators:
-#   - Specify the language you want to work on as an argument, which must be a file in the
-#     localization/po/ directory. You can specify a language which does not have translations
-#     yet by specifying the name of a file which does not yet exist.
-#     Make sure to follow the naming convention.
-# For testing:
-#   - Specify `--dry-run` to see if any updates to the PO files would by applied by this script.
-#     If this flag is specified, the script will exit with an error if there are outstanding
-#     changes, and will display the diff. Do not specify other flags if `--dry-run` is specified.
-#
-# Specify `--use-existing-template=DIR` to prevent running cargo for extracting an up-to-date
-# version of the localized strings. This flag is intended for testing setups which make it
-# inconvenient to run cargo here, but run it in an earlier step to ensure up-to-date values.
-# This argument is passed on to the `fish_xgettext.fish` script and has no other uses.
-# `DIR` must be the path to a gettext template file generated from our compilation process.
-# It can be obtained by running:
-#   set -l DIR (mktemp -d)
-#   FISH_GETTEXT_EXTRACTION_DIR=$DIR cargo check --features=gettext-extract
-
-# The sort utility is locale-sensitive.
-# Ensure that sorting output is consistent by setting LC_ALL here.
-set -gx LC_ALL C.UTF-8
-
-set -l build_tools (status dirname)
-set -l po_dir $build_tools/../localization/po
-
-set -l extract
-
-argparse dry-run use-existing-template= -- $argv
-or exit $status
-
-if test -z $argv[1]
-    # Update everything if not specified otherwise.
-    set -g po_files $po_dir/*.po
-else
-    set -l po_dir_id (stat --format='%d:%i' -- $po_dir)
-    for arg in $argv
-        set -l arg_dir_id (stat --format='%d:%i' -- (dirname $arg) 2>/dev/null)
-        if test $po_dir_id != "$arg_dir_id"
-            echo "Argument $arg is not a file in the directory $(realpath $po_dir)."
-            echo "Non-option arguments must specify paths to files in this directory."
-            echo ""
-            echo "If you want to add a new language to the translations not the following:"
-            echo "The filename must identify a language, with a two letter ISO 639-1 language code of the target language (e.g. 'pt' for Portuguese), and use the file extension '.po'."
-            echo "Optionally, you can specify a regional variant (e.g. 'pt_BR')."
-            echo "So valid filenames are of the shape 'll.po' or 'll_CC.po'."
-            exit 1
-        end
-        if not basename $arg | grep -qE '^[a-z]{2,3}(_[A-Z]{2})?\.po$'
-            echo "Filename does not match the expected format ('ll.po' or 'll_CC.po')."
-            exit 1
-        end
-    end
-    set -g po_files $argv
-end
-
-set -g template_file (mktemp)
-# Protect from externally set $tmpdir leaking into this script.
-set -g tmpdir
-
-function cleanup_exit
-    set -l exit_status $status
-
-    rm $template_file
-
-    if set -g --query tmpdir[1]
-        rm -r $tmpdir
-    end
-
-    exit $exit_status
-end
-
-if set -l --query extract
-    set -l xgettext_args
-    if set -l --query _flag_use_existing_template
-        set xgettext_args --use-existing-template=$_flag_use_existing_template
-    end
-    $build_tools/fish_xgettext.fish $xgettext_args >$template_file
-    or cleanup_exit
-end
-
-if set -l --query _flag_dry_run
-    # On a dry run, we do not modify localization/po/ but write to a temporary directory instead
-    # and check if there is a difference between localization/po/ and the tmpdir after re-generating
-    # the PO files.
-    set -g tmpdir (mktemp -d)
-
-    # Ensure tmpdir has the same initial state as the po dir.
-    cp -r $po_dir/* $tmpdir
-end
-
-# This is used to identify lines which should be set here via $header_lines.
-# Make sure that this prefix does not appear elsewhere in the file and only contains characters
-# without special meaning in a sed pattern.
-set -g header_prefix "# fish-note-sections: "
-
-function print_header
-    set -l header_lines \
-        "Translations are divided into sections, each starting with a fish-section-* pseudo-message." \
-        "The first few sections are more important." \
-        "Ignore the tier3 sections unless you have a lot of time."
-    for line in $header_lines
-        printf '%s%s\n' $header_prefix $line
-    end
-end
-
-function merge_po_files --argument-names template_file po_file
-    msgmerge --no-wrap --update --no-fuzzy-matching --backup=none --quiet \
-        $po_file $template_file
-    or cleanup_exit
-    set -l new_po_file (mktemp) # TODO Remove on failure.
-    # Remove obsolete messages instead of keeping them as #~ entries.
-    and msgattrib --no-wrap --no-obsolete -o $new_po_file $po_file
-    or cleanup_exit
-
-    begin
-        print_header
-        # Paste PO file without old header lines.
-        sed '/^'$header_prefix'/d' $new_po_file
-    end >$po_file
-    rm $new_po_file
-end
-
-for po_file in $po_files
-    if set --query tmpdir[1]
-        set po_file $tmpdir/(basename $po_file)
-    end
-    if test -e $po_file
-        merge_po_files $template_file $po_file
-    else
-        begin
-            print_header
-            cat $template_file
-        end >$po_file
-    end
-end
-
-if set -g --query tmpdir[1]
-    diff -ur $po_dir $tmpdir
-    or begin
-        echo ERROR: translations in localization/po/ are stale. Try running build_tools/update_translations.fish
-        cleanup_exit
-    end
-end
-
-cleanup_exit

build_tools/version-available-in-debian.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-channel=$1 # e.g. stable, testing
-package=$2 # e.g. rustc, sphinx
-
-codename=$(
-    curl -fsS https://ftp.debian.org/debian/dists/"${channel}"/Release |
-    grep '^Codename:' | cut -d' ' -f2)
-curl -fsS https://sources.debian.org/api/src/"${package}"/ |
-    jq -r --arg codename "${codename}" '
-        .versions[] | select(.suites[] == $codename) | .version' |
-    sed 's/^\([0-9]\+\.[0-9]\+\).*/\1/' |
-    sort --version-sort |
-    tail -1