Skip to content

Conversation

@xcrsz
Copy link
Contributor

@xcrsz xcrsz commented Nov 16, 2025

The CONFIG_DIR was hardcoded to "$SCRIPT_DIR/cardDetect", causing the script to look for configuration templates in /usr/local/bin/cardDetect when installed via the port, rather than the correct system-wide location at /usr/local/etc/X11/cardDetect.

This change updates the CONFIG_DIR initialization to:

  1. Check /usr/local/etc/X11/cardDetect first (system-wide installation)
  2. Fall back to $SCRIPT_DIR/cardDetect (development/portable usage)

This matches the documented dual-location behavior in README.md and ensures the script works correctly when installed via the x11/xconfig port, which installs config templates to /usr/local/etc/X11/cardDetect per the Makefile.

The script now functions correctly in both scenarios:

  • Production: Installed via pkg/port with configs in /usr/local/etc/X11
  • Development: Run in-tree with configs in ./cardDetect

Fixes issue where xconfig couldn't find XF86Config.* templates during GhostBSD bootstrap when installed from package.

Summary by Sourcery

Update config directory lookup to first check the system-wide installation path and fall back to the local directory, restoring the documented dual-location behavior and fixing template resolution when installed via the x11/xconfig port.

Bug Fixes:

  • Fix CONFIG_DIR to locate system-wide config templates when installed via package

Enhancements:

  • Prioritize /usr/local/etc/X11/cardDetect for configs before falling back to the script’s cardDetect directory

The CONFIG_DIR was hardcoded to "$SCRIPT_DIR/cardDetect", causing the
script to look for configuration templates in /usr/local/bin/cardDetect
when installed via the port, rather than the correct system-wide location
at /usr/local/etc/X11/cardDetect.

This change updates the CONFIG_DIR initialization to:
1. Check /usr/local/etc/X11/cardDetect first (system-wide installation)
2. Fall back to $SCRIPT_DIR/cardDetect (development/portable usage)

This matches the documented dual-location behavior in README.md and
ensures the script works correctly when installed via the x11/xconfig
port, which installs config templates to /usr/local/etc/X11/cardDetect
per the Makefile.

The script now functions correctly in both scenarios:
- Production: Installed via pkg/port with configs in /usr/local/etc/X11
- Development: Run in-tree with configs in ./cardDetect

Fixes issue where xconfig couldn't find XF86Config.* templates during
GhostBSD bootstrap when installed from package.
@xcrsz xcrsz requested review from a team as code owners November 16, 2025 05:04
@sourcery-ai
Copy link

sourcery-ai bot commented Nov 16, 2025

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

This pull request refactors the CONFIG_DIR initialization in the xconfig script to detect and prefer a system-wide configuration directory before falling back to the bundled development path, aligning actual behavior with the README documentation and ensuring correct operation when installed via package or run in-tree.

File-Level Changes

Change Details Files
Dynamic detection of configuration directory
  • Check for /usr/local/etc/X11/cardDetect first
  • Fall back to $SCRIPT_DIR/cardDetect if system-wide path is missing
  • Remove hardcoded CONFIG_DIR assignment
bin/xconfig

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey there - I've reviewed your changes and they look great!


Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@github-project-automation github-project-automation bot moved this from In Review to In Progress in Development Tracker Nov 17, 2025
@ericbsd ericbsd merged commit c48e50b into ghostbsd:master Nov 17, 2025
2 checks passed
@github-project-automation github-project-automation bot moved this from In Progress to Done in Development Tracker Nov 17, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

2 participants