From a49f0c20c87f8769b2409d01524f8f87122f20dc Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Mon, 8 Jul 2024 15:48:53 -0700 Subject: [PATCH] fix: Correct test for `cmp` and ignore `which` version --- galacticusInstall.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/galacticusInstall.sh b/galacticusInstall.sh index 18fb13e..0fc9897 100755 --- a/galacticusInstall.sh +++ b/galacticusInstall.sh @@ -414,7 +414,7 @@ buildEnvironment[$iPackage]="" iPackage=$(expr $iPackage + 1) package[$iPackage]="cmp" packageAtLevel[$iPackage]=0 - testPresence[$iPackage]="hash wget" + testPresence[$iPackage]="hash cmp" getVersion[$iPackage]="versionString=(\`cmp -v\`); echo \${versionString[3]}" minVersion[$iPackage]="0.0" maxVersion[$iPackage]="9.99" @@ -451,7 +451,7 @@ iPackage=$(expr $iPackage + 1) package[$iPackage]="which" packageAtLevel[$iPackage]=0 testPresence[$iPackage]="hash which" - getVersion[$iPackage]="versionString=(\`which -V | sed -r s/\"v([0-9\\.]+).*\"/\"\\1\"/\`); echo \${versionString[2]}" + getVersion[$iPackage]="echo 1.0.0" minVersion[$iPackage]="0.0" maxVersion[$iPackage]="9.99" yumInstall[$iPackage]="which"