Skip to content

Commit b3f2a76

Browse files
committed
skip geant4-config when doing data install
1 parent 3bc4a23 commit b3f2a76

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

ci/package_install.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,14 @@ archive_name_from_data_dir() {
9393

9494
geant4_dataset_records=()
9595

96-
if command -v geant4-config >/dev/null 2>&1; then
97-
eval "$(geant4-config --sh)"
96+
# Populate the G4*DATA descriptors from geant4-config only when they are not
97+
# already exported. A relocated geant4.env (the macOS tarball flow) exports them
98+
# pointing at the data it actually installed; geant4-config instead reports the
99+
# absolute paths baked in at build time, which do not exist after relocation.
100+
if ! env | grep -qE '^G4[A-Z0-9_]*DATA='; then
101+
if command -v geant4-config >/dev/null 2>&1; then
102+
eval "$(geant4-config --sh)"
103+
fi
98104
fi
99105

100106
while IFS='=' read -r env_name env_path; do

0 commit comments

Comments
 (0)