-
Notifications
You must be signed in to change notification settings - Fork 33
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
refactor: use standard path for just plus... #42
refactor: use standard path for just plus... #42
Conversation
This changes the ublue-os-just RPM by: - using /usr/share/ublue-os/just path (no double ublue-os) - renames "justfile" to "main.just" - adds "nvidial.just" and "custom.just" - improves profile script to smartly add appropriate just files Closes #41
Woo! This is looking really awesome! :)
# Only process users with home directories, who are lacking a justfile.
if [ ! -z "$HOME" ] && [ -d "$HOME" ] && [ ! -f "${HOME}/.justfile" ]; then
UBLUE_JUST=/usr/share/ublue-os/just
USER_JUSTFILE="${HOME}/.justfile"
touch "${USER_JUSTFILE}"
if [ -f ${UBLUE_JUST}/main.just ]; then
cat ${UBLUE_JUST}/main.just >> "${USER_JUSTFILE}"
fi
if [ -f ${UBLUE_JUST}/nvidia.just ] && [ rpm -q xorg-x11-drv-nvidia ]; then
cat ${UBLUE_JUST}/nvidia.just >> "${USER_JUSTFILE}"
fi
if [ -f ${UBLUE_JUST}/custom.just ]; then
cat ${UBLUE_JUST}/custom.just >> "${USER_JUSTFILE}"
fi
fi This would work on every shell. :) |
this makes sense except for this line:
I was originally using |
Yep, it was just for the paranoid scenario where someone makes their own image without |
Cool. I'm content with being paranoid. |
build/ublue-os-just/ublue-os-just.sh
Outdated
if [ -f ${UBLUE_JUST}/main.just ]; then | ||
cp ${UBLUE_JUST}/main.justfile "${USER_JUSTFILE}" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice. It's easy to get blind from these filenames since we're writing .just
files to .justfile
, so I didn't notice that either!
As of ublue-os/config#42 config repo's ublue-os-just RPM provides both the main.just and nvidia.just files.
nvidia's related PR is prepped: ublue-os/hwe#101 |
Change to check if ublue-os-nvidia-addons RPM is installed vs a generic nvidia RPM as a downstream packager could conceivably use ublue-os/main and startingpoint, but still roll their own nvidia build and would NOT want our specific nvidia.just file.
@@ -7,7 +7,7 @@ if [ ! -z "$HOME" ] && [ -d "$HOME" ] && [ ! -f "${HOME}/.justfile" ]; then | |||
if [ -f ${UBLUE_JUST}/main.just ]; then | |||
cat ${UBLUE_JUST}/main.just >> "${USER_JUSTFILE}" | |||
fi | |||
if [ -f ${UBLUE_JUST}/nvidia.just ] && [ rpm -q xorg-x11-drv-nvidia ]; then | |||
if [ -f ${UBLUE_JUST}/nvidia.just ] && [ rpm -q ublue-os-nvidia-addons ]; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's a really good idea, and good reason for it!
As of ublue-os/config#42 config repo's ublue-os-just RPM provides both the main.just and nvidia.just files.
This changes the ublue-os-just RPM by:
Closes #41