diff options
| -rwxr-xr-x | unix/hlib/irafuser.sh | 4 | ||||
| -rwxr-xr-x | unix/hlib/setup.sh | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/unix/hlib/irafuser.sh b/unix/hlib/irafuser.sh index 815b1ee9..a4d036cc 100755 --- a/unix/hlib/irafuser.sh +++ b/unix/hlib/irafuser.sh @@ -143,8 +143,8 @@ fi export HSI_LIBS="$HSI_LIBS $HSI_OSLIBS" -alias mkiraf=${hlib}mkiraf.csh -alias mkmlist=${hlib}mkmlist.csh +alias mkiraf=${hlib}mkiraf.sh +alias mkmlist=${hlib}mkmlist.sh #alias mkz=${hbin}mkpkg.e "$mkzflags" alias edsym=${hbin}edsym.e diff --git a/unix/hlib/setup.sh b/unix/hlib/setup.sh index fc96eeb6..882bf828 100755 --- a/unix/hlib/setup.sh +++ b/unix/hlib/setup.sh @@ -1,17 +1,17 @@ #!/bin/bash # Allow a previously defined $iraf to be used. -if [ -n $iraf ]; then +if [ -z "$iraf" ]; then export iraf=/iraf/iraf/ fi # Allow a previously defined $IRAFARCH to be used. -if [ -n $IRAFARCH ]; then +if [ -z "$IRAFARCH" ]; then export IRAFARCH=`$iraf/unix/hlib/irafarch.sh -actual` fi source $iraf/unix/hlib/irafuser.sh -export PATH=$HOME/.iraf/bin:${PATH} +export PATH=$iraf/fakehome/bin:$iraf/bin:${PATH} # The world'd most obvious alias .... alias iraf="xgterm -e cl &" |