Skip to content

Fix the isisStartup scripts for users outside of USGS systems #5938

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.

Sign up for GitHub

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

Merged
acpaquette merged 2 commits into from
Jan 16, 2026
Merged

Fix the isisStartup scripts for users outside of USGS systems #5938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
617a57b
Correct ISISDATA assignment in isis*Startup.* scripts
cordellmichaud Jan 15, 2026
719d591
Add changelog entry for isisStartup scripts fix
cordellmichaud Jan 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ ctest FunctionalTestJigsawApollo to validate this output. [#5710](https://github
- Fixed `BundleObservationSolveSettings` to properly read empty solve setting xmls [#5822](https://github.com/DOI-USGS/ISIS3/pull/5822)
- Fixed `footprintinit` to find mapping group (no caps). [#5920](https://github.com/DOI-USGS/ISIS3/pull/5820)
- Fixed unnecessary un/distortion checks for pixels near the origin. [#5861](https://github.com/DOI-USGS/ISIS3/issues/5861)
- Fixed the isisStartup scripts for users outside of USGS systems. [#5478](https://github.com/DOI-USGS/ISIS3/issues/5478)

### Removed
- QT 6 removed MySQL support so MySQL is no longer supported in `isisminer` [#5909](https://github.com/DOI-USGS/ISIS3/pull/5909)
Expand Down
2 changes: 1 addition & 1 deletion isis/scripts/isis3Startup.csh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ if ($?ISISROOT == 0) then
endif

# Initialize the ISISDATA environment variable
if (-d $ISISROOT/../data) then
if (-d $ISISROOT/../isis_data) then
setenv ISISDATA $ISISROOT/../isis_data
else
setenv ISISDATA /usgs/cpkgs/isis3/isis_data
Expand Down
2 changes: 1 addition & 1 deletion isis/scripts/isis3Startup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def setisis():
os.environ['ISISROOT'] = ISISROOT

#Check for the ISISDATA directory. If it does not exist use a default
if os.path.exists("%s/../data" % (ISISROOT)):
if os.path.exists("%s/../isis_data" % (ISISROOT)):
os.environ['ISISDATA'] = "%s/../isis_data" % (ISISROOT)
else:
os.environ['ISISDATA'] = "/usgs/cpkgs/isis3/isis_data"
Expand Down
2 changes: 1 addition & 1 deletion isis/scripts/isis3Startup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ if [ ! "$ISISROOT" ]; then
export ISISROOT
fi

if [ -d $ISISROOT/../data ]; then
if [ -d $ISISROOT/../isis_data ]; then
ISISDATA=$ISISROOT/../isis_data
else
ISISDATA=/usgs/cpkgs/isis3/isis_data
Expand Down
2 changes: 1 addition & 1 deletion isis/scripts/isisStartup.csh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ if ($?ISISROOT == 0) then
endif

if ($?ISISDATA == 0) then
if (-d $ISISROOT/../data) then
if (-d $ISISROOT/../isis_data) then
setenv ISISDATA $ISISROOT/../isis_data
else
setenv ISISDATA /usgs/cpkgs/isis3/isis_data
Expand Down
2 changes: 1 addition & 1 deletion isis/scripts/isisStartup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ if [ ! "$ISISROOT" ]; then
fi

if [ ! "$ISISDATA" ]; then
if [ -d $ISISROOT/../data ]; then
if [ -d $ISISROOT/../isis_data ]; then
ISISDATA=$ISISROOT/../isis_data
else
ISISDATA=/usgs/cpkgs/isis3/isis_data
Expand Down