-
Notifications
You must be signed in to change notification settings - Fork 4
feat: Add outdated eic-shell warning for singularity/apptainer users #180
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
Open
Copilot
wants to merge
5
commits into
master
Choose a base branch
from
copilot/add-warning-for-singularity-users
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+43
−0
Open
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
52de24c
Initial plan
Copilot 0b2b332
Add warning for singularity/apptainer users with outdated eic-shell s…
Copilot 2ab6df8
fix: require EIC_SHELL_PREFIX (only singularity/apptainer)
wdconinc c54d876
fix: allow sh/dash, avoid bashism
wdconinc 828f23f
fix: use posix find and don't grep quiet
wdconinc File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| #!/bin/bash | ||
|
|
||
| ## Warn users running singularity/apptainer when their outer eic-shell script is outdated. | ||
| ## Users can upgrade by running `eic-shell --upgrade` outside the container. | ||
|
|
||
| # Only run for interactive shells | ||
| case "$-" in | ||
| *i*) ;; | ||
| *) return 0 ;; | ||
| esac | ||
|
|
||
| # Only run when inside singularity/apptainer | ||
| if [ -z "${SINGULARITY_CONTAINER:-}" ] && [ -z "${APPTAINER_CONTAINER:-}" ]; then | ||
| return 0 | ||
| fi | ||
|
|
||
| # Require EIC_SHELL_PREFIX to be set; otherwise we cannot locate the outer eic-shell | ||
| if [ -z "${EIC_SHELL_PREFIX:-}" ]; then | ||
| return 0 | ||
| fi | ||
|
|
||
| # Check if the outer eic-shell script is accessible | ||
| _outer_eic_shell="${EIC_SHELL_PREFIX}/../eic-shell" | ||
| if [ ! -f "$_outer_eic_shell" ]; then | ||
| unset _outer_eic_shell | ||
| return 0 | ||
| fi | ||
|
|
||
| # Only warn if we have write access (meaning user can upgrade) | ||
| if [ ! -w "$_outer_eic_shell" ]; then | ||
| unset _outer_eic_shell | ||
| return 0 | ||
| fi | ||
|
|
||
| # Warn if the outer eic-shell script is older than 6 months (~180 days) | ||
| if find "$_outer_eic_shell" -mtime +180 -print -quit 2>/dev/null | grep -q .; then | ||
| echo "" | ||
| echo "WARNING: Your eic-shell script appears to be more than 6 months old." | ||
| echo " Consider upgrading by running outside the container:" | ||
| echo " eic-shell --upgrade" | ||
| echo "" | ||
| fi | ||
| unset _outer_eic_shell | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.