`fa50d33`

v1.0.2: Restructure installation, add NixOS support

- Move binary to /usr/lib/fortress/fortress (out of PATH)
- Add wrapper script /usr/bin/fortress that calls the binary
- Eliminate fortress-bin naming convention
- Add flake.nix for NixOS users
- Update shell integrations (fortress.sh, fortress.fish) with better path detection
- Add CLAUDE.md for Claude Code guidance
- Support /usr/lib64 path for 64-bit RPM systems

Authored by

espadonne 4 months ago

SHA: fa50d33683e5878552f1d8fdde00627fcaf8e9d4
Parents: 272a1cf
Tree: 42852d4

8 changed files

Status	File	+	-
A	`CLAUDE.md`	60	0
M	`PKGBUILD`	7	4
A	`flake.nix`	91	0
A	`fortress-wrapper.sh`	21	0
M	`fortress.fish`	33	21
M	`fortress.sh`	33	12
M	`fortress.spec`	15	4
M	`fpm.toml`	1	1

CLAUDE.mdadded

 +# CLAUDE.md
++
 +This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
++
 +## Build Commands
++
 +```bash
 +fpm build                          # Debug build
 +fpm build --flag "-O2"             # Release build with optimization
 +fpm build --flag "-g -Wall -Wextra" # Build with debug flags and warnings
 +fpm run                            # Build and run
 +fpm test                           # Run test suite
 +```
++
 +**Dependencies**: gfortran 10+ (or ifort), fpm, ncurses library
++
 +## Architecture
++
 +FORTRESS is a CLI file manager written in modern Fortran (2008+) with dual-pane navigation, git integration, and fuzzy search.
++
 +### Module Structure
++
 +```
 +app/main.f90              # Main event loop, state management, user input (~1100 LOC)
 +src/
 +├── filesystem/fs_ops.f90     # Directory reading, path manipulation, fzf search, file ops
 +├── ui/display.f90            # Dual-pane rendering (30% parent | 70% current), color output
 +├── ui/preview.f90            # File preview functionality
 +├── terminal/term_control.f90 # Raw mode, ANSI codes, terminal size, key reading
 +├── git/git_ops.f90           # Git status, staging, commits, push/pull, diff display
 +└── version/version.f90       # Version info (auto-generated by stamp-version.sh)
 +```
++
 +### Key Patterns
++
 +**State Management**: The main event loop in `main.f90` manages:
 +- Navigation state (`current_dir`, `parent_dir`, `selected`, `scroll_offset`)
 +- Mode flags (`move_mode`, `in_rename_mode`, `in_selection_mode`)
 +- Clipboard (`has_clipboard`, `clipboard_paths[]`, copy vs cut)
 +- Multi-select tracking (`is_selected[]`, `selection_count`)
 +- Favorites stored in `~/.fortress_favorites`
++
 +**Terminal Control**:
 +- Uses alternate screen buffer (`ESC[?1049h/l`) to prevent scroll artifacts
 +- Raw mode via `stty` for non-blocking, character-by-character input
 +- Terminal size caching (refreshes every 100 calls)
++
 +**External Commands**: All shell commands use `execute_command_line()` - ensure proper escaping for paths with special characters.
++
 +**Git Integration**: Uses git CLI directly; status is cached with 500ms TTL. Directories show recursive status indicators.
++
 +**Shell Integration**: `~/.fortress_cd` file enables cd-on-exit feature; wrapper scripts in `fortress.sh`/`fortress.fish` read this file.
++
 +### Constants
++
 +Defined across modules: `MAX_PATH=512`, `MAX_FILES=500`
++
 +### Color Scheme
++
 +Blue=directories, Green=executables, Grey=dotfiles, Red=cut files/staged, Yellow=warnings/incoming changes

PKGBUILDmodified

  # Maintainer: Matthew Wolffe <mfwolffe@outlook.com>
  pkgname=fortress
 -pkgver=0.9.99
 +pkgver=1.0.2
  pkgrel=1
  pkgdesc="A command-line file explorer written in modern Fortran with cd-on-exit"
  arch=('x86_64' 'aarch64')
  package() {
      cd "$srcdir/$pkgname-$pkgver"
 -    # Install the binary
 -    install -Dm755 "build/gfortran_"*"/app/fortress" "$pkgdir/usr/bin/fortress-bin"
 +    # Install the binary to lib (not directly in PATH)
 +    install -Dm755 "build/gfortran_"*"/app/fortress" "$pkgdir/usr/lib/fortress/fortress"
 -    # Install shell integration files
 +    # Install wrapper script to /usr/bin/fortress
 +    install -Dm755 "fortress-wrapper.sh" "$pkgdir/usr/bin/fortress"
++
 +    # Install shell integration files (for cd-on-exit when sourced)
      install -Dm644 "fortress.sh" "$pkgdir/usr/share/fortress/fortress.sh"
      install -Dm644 "fortress.fish" "$pkgdir/usr/share/fortress/fortress.fish"

flake.nixadded

 +{
 +  description = "FORTRESS - A command-line file explorer written in modern Fortran";
++
 +  inputs = {
 +    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
 +    flake-utils.url = "github:numtide/flake-utils";
 +  };
++
 +  outputs = { self, nixpkgs, flake-utils }:
 +    flake-utils.lib.eachDefaultSystem (system:
 +      let
 +        pkgs = nixpkgs.legacyPackages.${system};
++
 +        fortress = pkgs.stdenv.mkDerivation rec {
 +          pname = "fortress";
 +          version = "1.0.2";
++
 +          src = ./.;
++
 +          nativeBuildInputs = with pkgs; [
 +            gfortran
 +            fortran-fpm
 +            makeWrapper
 +          ];
++
 +          buildInputs = with pkgs; [
 +            ncurses
 +          ];
++
 +          buildPhase = ''
 +            # fpm needs a writable home for cache
 +            export HOME=$(mktemp -d)
 +            fpm build --flag "-O2"
 +          '';
++
 +          installPhase = ''
 +            # Install binary to lib directory
 +            mkdir -p $out/lib/fortress
 +            cp build/gfortran_*/app/fortress $out/lib/fortress/fortress
++
 +            # Create wrapper script in bin
 +            mkdir -p $out/bin
 +            makeWrapper $out/lib/fortress/fortress $out/bin/fortress
++
 +            # Install shell integration files
 +            mkdir -p $out/share/fortress
 +            cp fortress.sh $out/share/fortress/
 +            cp fortress.fish $out/share/fortress/
++
 +            # Patch fortress.sh to find binary in nix store
 +            substituteInPlace $out/share/fortress/fortress.sh \
 +              --replace '/usr/lib/fortress/fortress' "$out/lib/fortress/fortress"
++
 +            # Install docs
 +            mkdir -p $out/share/doc/fortress
 +            cp README.md $out/share/doc/fortress/
 +            [ -f USAGE.md ] && cp USAGE.md $out/share/doc/fortress/ || true
 +          '';
++
 +          meta = with pkgs.lib; {
 +            description = "A command-line file explorer written in modern Fortran with fzf integration";
 +            homepage = "https://github.com/FortranGoingOnForty/fortress";
 +            license = licenses.mit;
 +            platforms = platforms.unix;
 +            mainProgram = "fortress";
 +          };
 +        };
 +      in
 +      {
 +        packages = {
 +          default = fortress;
 +          fortress = fortress;
 +        };
++
 +        apps.default = {
 +          type = "app";
 +          program = "${fortress}/bin/fortress";
 +        };
++
 +        devShells.default = pkgs.mkShell {
 +          buildInputs = with pkgs; [
 +            gfortran
 +            fortran-fpm
 +            ncurses
 +            fzf
 +            git
 +          ];
 +        };
 +      }
 +    );
 +}

fortress-wrapper.shadded

 +#!/usr/bin/env bash
 +# FORTRESS wrapper script
 +# Installed to /usr/bin/fortress, calls binary at /usr/lib/fortress/fortress
 +#
 +# Note: This script cannot change your shell's directory. For cd-on-exit
 +# functionality (press 'c' to navigate), source fortress.sh in your shell rc:
 +#   source /usr/share/fortress/fortress.sh
 +#
 +# The shell function will take precedence over this script when sourced.
++
 +if [ -n "$FORTRESS_BIN" ] && [ -x "$FORTRESS_BIN" ]; then
 +    exec "$FORTRESS_BIN" "$@"
 +elif [ -x "/usr/lib/fortress/fortress" ]; then
 +    exec /usr/lib/fortress/fortress "$@"
 +elif [ -x "/usr/lib64/fortress/fortress" ]; then
 +    exec /usr/lib64/fortress/fortress "$@"
 +else
 +    echo "fortress: binary not found" >&2
 +    echo "Set FORTRESS_BIN to override the binary location." >&2
 +    exit 1
 +fi

fortress.fishmodified

  #   ~/.config/fish/functions/fortress.fish
  # or
  #   /usr/share/fish/vendor_functions.d/fortress.fish (system-wide)
 +#
 +# This provides the cd-on-exit feature. Without this function,
 +# you can still run fortress but 'c' won't change your shell's directory.
  function fortress --description "Navigate filesystem with FORTRESS and cd on exit"
 -    # Set fortress directory - prefer system install, fallback to FORTRESS_DIR env var
 -    set -l fortress_dir
      set -l fortress_exe
 -    # Check for fortress-bin in PATH first (works for all package managers including Homebrew)
 -    if command -v fortress-bin &> /dev/null
 +    # Check standard install locations (lib path first, then legacy bin path)
 +    if test -x /usr/lib/fortress/fortress
 +        set fortress_exe /usr/lib/fortress/fortress
 +    else if test -x /usr/lib64/fortress/fortress
 +        set fortress_exe /usr/lib64/fortress/fortress
 +    else if command -v fortress-bin &> /dev/null
 +        # Legacy: fortress-bin in PATH (Homebrew, older packages)
          set fortress_exe fortress-bin
 -    else if test -x /usr/bin/fortress-bin
 -        # Use system-installed binary (RPM/AUR)
 -        set fortress_exe /usr/bin/fortress-bin
 +    else if set -q FORTRESS_BIN
 +        # Allow override via environment variable
 +        set fortress_exe $FORTRESS_BIN
      else if set -q FORTRESS_DIR
 -        set fortress_dir $FORTRESS_DIR
 -        set fortress_exe $fortress_dir/build/gfortran_*/app/fortress
 +        # Development: FORTRESS_DIR points to repo root
 +        set fortress_exe $FORTRESS_DIR/build/gfortran_*/app/fortress
      else
 -        # Fallback to local development path
 -        set fortress_dir $HOME/Documents/GithubOrgs/FortranGoingOnForty/fortress
 -        set fortress_exe $fortress_dir/build/gfortran_*/app/fortress
 +        # Fallback: look for any fortress executable (NixOS, custom installs)
 +        set -l found (type -P fortress 2>/dev/null)
 +        if test -n "$found" -a -x "$found"
 +            set fortress_exe $found
 +        else
 +            echo "fortress: binary not found. Set FORTRESS_BIN or FORTRESS_DIR." >&2
 +            return 1
 +        end
      end
      # Run fortress
 -    if test -n "$fortress_exe"
 -        eval $fortress_exe
 -    else
 -        $fortress_dir/build/gfortran_*/app/fortress
 -    end
 +    eval $fortress_exe $argv
 +    set -l exit_code $status
      # Check if fortress wants us to cd somewhere
      if test -f $HOME/.fortress_cd
          set -l target_dir (cat $HOME/.fortress_cd)
          rm -f $HOME/.fortress_cd
 -        if cd $target_dir 2>/dev/null
 -            echo "fortress: changed directory to "(pwd)
 -        else
 -            echo "fortress: failed to change directory to $target_dir" >&2
 +        if test -n "$target_dir" -a -d "$target_dir"
 +            if cd $target_dir 2>/dev/null
 +                echo "fortress: changed directory to "(pwd)
 +            else
 +                echo "fortress: failed to change directory to $target_dir" >&2
 +            end
          end
      end
++
 +    return $exit_code
  end

fortress.shmodified

  # FORTRESS shell integration
  # Add this to your .bashrc or .zshrc:
 -#   source ~/Documents/GithubOrgs/FortranGoingOnForty/fortress/fortress.sh
 +#   source /usr/share/fortress/fortress.sh
+ #
  # Then use: fortress
 +#
 +# This provides the cd-on-exit feature. Without sourcing this file,
 +# you can still run fortress but 'c' won't change your shell's directory.
  fortress() {
      # Determine which fortress binary to use
      local fortress_exe
 -    # Check for fortress-bin in PATH first (works for all package managers including Homebrew)
 -    if command -v fortress-bin &> /dev/null; then
 +    # Check standard install locations (lib path first, then legacy bin path)
 +    if [ -x "/usr/lib/fortress/fortress" ]; then
 +        fortress_exe="/usr/lib/fortress/fortress"
 +    elif [ -x "/usr/lib64/fortress/fortress" ]; then
 +        fortress_exe="/usr/lib64/fortress/fortress"
 +    elif command -v fortress-bin &> /dev/null; then
 +        # Legacy: fortress-bin in PATH (Homebrew, older packages)
          fortress_exe="fortress-bin"
 -    elif [ -x "/usr/bin/fortress-bin" ]; then
 -        # Use system-installed binary (via package manager like RPM/AUR)
 -        fortress_exe="/usr/bin/fortress-bin"
 +    elif [ -n "$FORTRESS_BIN" ]; then
 +        # Allow override via environment variable
 +        fortress_exe="$FORTRESS_BIN"
      elif [ -n "$FORTRESS_DIR" ]; then
 -        # Use FORTRESS_DIR if set
 +        # Development: FORTRESS_DIR points to repo root
          fortress_exe="$FORTRESS_DIR/build/gfortran_"*"/app/fortress"
      else
 -        # Fallback to local development path
 -        fortress_exe="$HOME/Documents/GithubOrgs/FortranGoingOnForty/fortress/build/gfortran_"*"/app/fortress"
 +        # Fallback: look for any fortress executable (NixOS, custom installs)
 +        # Use command -v to find it, but filter out this function
 +        local found
 +        found=$(type -P fortress 2>/dev/null)
 +        if [ -n "$found" ] && [ -x "$found" ]; then
 +            fortress_exe="$found"
 +        else
 +            echo "fortress: binary not found. Set FORTRESS_BIN or FORTRESS_DIR." >&2
 +            return 1
 +        fi
      fi
      # Run fortress
 -    $fortress_exe
 +    "$fortress_exe" "$@"
 +    local exit_code=$?
      # Check if fortress wants us to cd somewhere
      if [ -f "$HOME/.fortress_cd" ]; then
          local target_dir
          target_dir=$(cat "$HOME/.fortress_cd")
          rm -f "$HOME/.fortress_cd"
 -        cd "$target_dir" || return 1
 -        echo "fortress: changed directory to $(pwd)"
 +        if [ -n "$target_dir" ] && [ -d "$target_dir" ]; then
 +            cd "$target_dir" || return 1
 +            echo "fortress: changed directory to $(pwd)"
 +        fi
      fi
++
 +    return $exit_code
+ }
  # For zsh compatibility

fortress.specmodified

  %global debug_package %{nil}
  Name:           fortress
 -Version:        1.0.1
 +Version:        1.0.2
  Release:        1%{?dist}
  Summary:        A command-line file explorer written in modern Fortran with cd-on-exit
  %install
  mkdir -p %{buildroot}%{_bindir}
 +mkdir -p %{buildroot}%{_libdir}/%{name}
  mkdir -p %{buildroot}%{_datadir}/%{name}
  mkdir -p %{buildroot}%{_datadir}/fish/vendor_functions.d
  mkdir -p %{buildroot}%{_sysconfdir}/profile.d
  mkdir -p %{buildroot}%{_docdir}/%{name}
 -# Install the binary
 -install -Dm755 build/gfortran_*/app/fortress %{buildroot}%{_bindir}/fortress-bin
 +# Install the binary to lib (not directly in PATH)
 +install -Dm755 build/gfortran_*/app/fortress %{buildroot}%{_libdir}/%{name}/fortress
++
 +# Install wrapper script to bin
 +install -Dm755 fortress-wrapper.sh %{buildroot}%{_bindir}/fortress
  # Install shell integration files to shared location
  install -Dm644 fortress.sh %{buildroot}%{_datadir}/%{name}/fortress.sh
  %files
  %license LICENSE
  %doc README.md
 -%{_bindir}/fortress-bin
 +%{_bindir}/fortress
 +%{_libdir}/%{name}/fortress
  %{_datadir}/%{name}/fortress.sh
  %{_datadir}/%{name}/fortress.fish
  %config(noreplace) %{_sysconfdir}/profile.d/fortress.sh
  EOF
  %changelog
 +* Sat Dec 28 2025 mfw <mfwolffe@outlook.com> - 1.0.2-1
 +- Move binary to /usr/lib/fortress/, add wrapper script to /usr/bin/fortress
 +- Eliminate fortress-bin naming, both script and binary now named fortress
 +- Add NixOS flake.nix support
 +- Improve shell integration scripts with better path detection
++
  * Fri Dec 05 2025 mfw <espadon@outlook.com> - 1.0.0-1
  - Fix top status bar not rendering on some terminals
  - Merge favorites: fuzzy jump, rename mode, git mode toggle, Alt-key bindings

fpm.tomlmodified

  name = "fortress"
 -version = "1.0.1"
 +version = "1.0.2"
  license = "MIT"
  author = "Matthew Wolffe"
  maintainer = "mfwolffe@outlook.com"