diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-04-17 04:02:28 +0100 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-04-17 04:02:28 +0100 |
| commit | 9ed594ec27405e38548d6efd6fe28a4dabf0fb41 (patch) | |
| tree | c1fdf80bd1b65056d5216b9cdda2e3fccc958c1a /reproduce/software/shell | |
| parent | f4d998a36d6777164147b848b0ac4747c38067cf (diff) | |
| parent | 8eb0892e179b4970a9835d29b5f57dd912ca4464 (diff) | |
Imported recent work in Maneage, minor conflicts fixed
A few minor conflicts came up that were easily fixed.
Diffstat (limited to 'reproduce/software/shell')
| -rwxr-xr-x | reproduce/software/shell/configure.sh | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/reproduce/software/shell/configure.sh b/reproduce/software/shell/configure.sh index cf2ef5d..4eefe7b 100755 --- a/reproduce/software/shell/configure.sh +++ b/reproduce/software/shell/configure.sh @@ -36,15 +36,13 @@ optionaldir="/optional/path" adir=reproduce/analysis/config cdir=reproduce/software/config -sbdir=$cdir/installation - -pconf=$sbdir/LOCAL.conf -ptconf=$sbdir/LOCAL_tmp.conf -poconf=$sbdir/LOCAL_old.conf -depverfile=$cdir/installation/versions.conf -depshafile=$cdir/installation/checksums.conf +pconf=$cdir/LOCAL.conf +ptconf=$cdir/LOCAL_tmp.conf +poconf=$cdir/LOCAL_old.conf +depverfile=$cdir/versions.conf +depshafile=$cdir/checksums.conf # --------- Delete for no Gnuastro --------- -glconf=$cdir/gnuastro/gnuastro-local.conf +glconf=$adir/gnuastro/gnuastro-local.conf # ------------------------------------------ |