diff options
| author | James E.H. Turner <jturner@gemini.edu> | 2016-08-25 13:58:11 -0400 |
|---|---|---|
| committer | James E.H. Turner <jturner@gemini.edu> | 2016-08-25 13:58:11 -0400 |
| commit | 5a2d242281c92eac4ce248b27e96e9358ab8b851 (patch) | |
| tree | c2ae66dd5c13ab411c4508b3c20e9819fb7f2334 | |
| parent | 9be55f5d7dce4f34bc14b417b9cb4201246986ff (diff) | |
| download | astroconda-iraf-helpers-5a2d242281c92eac4ce248b27e96e9358ab8b851.tar.gz | |
Add some more IRAF definition variables & rename them a bit more nicely.
| -rwxr-xr-x | scripts/check_iraf_pkg_build | 4 | ||||
| -rw-r--r-- | scripts/iraf_defs | 16 |
2 files changed, 16 insertions, 4 deletions
diff --git a/scripts/check_iraf_pkg_build b/scripts/check_iraf_pkg_build index e33190f..cf0b9e3 100755 --- a/scripts/check_iraf_pkg_build +++ b/scripts/check_iraf_pkg_build @@ -60,14 +60,14 @@ if [ ! -r "$bld_log" ]; then echo "ERROR: cannot read $bld_log" >&2 st=1 fi -pkg_patterns="${pkg_path}${pkg_patt_name}" +pkg_patterns="${pkg_path}${pkg_patterns}" if [ ! -r "$pkg_patterns" ]; then echo "ERROR: cannot read $pkg_patterns" >&2 st=1 fi # Check for an optional manifest: -manifest="${pkg_path}${manifest_name}" +manifest="${pkg_path}${pkg_manifest}" if [ ! -r "$manifest" ]; then echo "Warning: no manifest in $pkg_path" >&2 manifest="" diff --git a/scripts/iraf_defs b/scripts/iraf_defs index 4428ed3..2f7ea1b 100644 --- a/scripts/iraf_defs +++ b/scripts/iraf_defs @@ -1,7 +1,19 @@ # Some common IRAF-package name definitions for the sh scripts in this dir. +# (also see separate defs. in the python scripts for now) + +extern_dir="iraf_extern" +extern_pkg="extern.pkg" + +pkg_extpkg="ur_extern.pkg" +pkg_manifest="ur_manifest" +pkg_patterns="ur_mkpkg_patterns" +pkg_mkpkg_cmd="ur_mkpkg_cmd" +pkg_mkhelp_cmd="ur_mkhelp_cmd" log_name="build_log" err_log_name="build_log.errors" -manifest_name="ur_manifest" -pkg_patt_name="ur_mkpkg_patterns" + +# Files to copy from the recipe to the build: +ac_iraf_files="$pkg_extpkg $pkg_manifest $pkg_patterns $pkg_mkpkg_cmd\ + $pkg_mkhelp_cmd" |