diff options
Diffstat (limited to 'install')
| -rwxr-xr-x | install | 79 |
1 files changed, 42 insertions, 37 deletions
@@ -1015,43 +1015,48 @@ ECHO " Editing Paths" ECHO " -------------" BOLD_OFF -# Edit the $iraf pathname in the .login file for user 'iraf'. -if (( $do_system==0 )); then - ECHO -n "Editing the iraf user .login/.cshrc paths ... " - pfiles=("$iraf/local/.cshrc $iraf/local/.login") -else - ECHO -n "Editing the user .login/.cshrc paths ... " - if [ "$SHELL" == "/bin/sh" ]; then - pfiles=("$HOME/.bashrc $HOME/.profile $HOME/.bash_profile $HOME/.bash_login") - else - pfiles=("$HOME/.cshrc $HOME/.login") - fi -fi -for file in ${pfiles[@]}; do - if [ -e "$file" ]; then - if [ "$exec" == "yes" ]; then - RM $TEMP >& /dev/null - sed -e "s+$o_iraf+$iraf+" $file > $TEMP - cmp -s $file $TEMP - if (( $?==1 )); then - PUT $TEMP $file - fi - RM $TEMP >& /dev/null - fi - else - if (( "$err_seen"=0 )); then - DO_FAIL - err_seen=1 - err_count=$(( err_count+1 )) - fi - MSG "Cannot find the iraf $file file" - RM $TEMP >& /dev/null - fi -done +echo "Editing the user login paths... WILL NOT COMPLY..." if (( "$err_seen"==0 )); then DO_OK fi +# Edit the $iraf pathname in the .login file for user 'iraf'. +#if (( $do_system==0 )); then +# ECHO -n "Editing the iraf user .login/.cshrc paths ... " +# pfiles=("$iraf/local/.cshrc $iraf/local/.login") +#else +# ECHO -n "Editing the user .login/.cshrc paths ... " +# if [ "$SHELL" == "/bin/sh" ]; then +# pfiles=("$FAKEHOME/.bashrc $FAKEHOME/.profile $FAKEHOME/.bash_profile $FAKEHOME/.bash_login") +# else +# pfiles=("$FAKEHOME/.cshrc $FAKEHOME/.login") +# fi +#fi +#for file in ${pfiles[@]}; do +# if [ -e "$file" ]; then +# if [ "$exec" == "yes" ]; then +# RM $TEMP >& /dev/null +# sed -e "s+$o_iraf+$iraf+" $file > $TEMP +# cmp -s $file $TEMP +# if (( $?==1 )); then +# PUT $TEMP $file +# fi +# RM $TEMP >& /dev/null +# fi +# else +# if (( "$err_seen"=0 )); then +# DO_FAIL +# err_seen=1 +# err_count=$(( err_count+1 )) +# fi +# MSG "Cannot find the iraf $file file" +# RM $TEMP >& /dev/null +# fi +#done +#if (( "$err_seen"==0 )); then +# DO_OK +#fi + # Edit the $iraf and $imdir paths in mkiraf.*sh, *cl.*sh, and libc/iraf.h # files. @@ -1527,8 +1532,8 @@ if (( "$do_system"==1 )); then file1=/usr/local/lib/imtoolrc ECHO -n "Creating /usr/local/lib/imtoolrc link ... " else - file1=$HOME/.imtoolrc - ECHO -n 'Creating $HOME/.imtoolrc link ... ' + file1=$FAKEHOME/.imtoolrc + ECHO -n 'Creating $FAKEHOME/.imtoolrc link ... ' fi RM -f $file1 file2=$iraf/dev/imtoolrc @@ -1608,8 +1613,8 @@ if [ "$do_system" == 0 ]; then cd $cur # Add the setup to the user's login files. - cfiles=("$HOME/.cshrc $HOME/.tcshrc $HOME/.login") - bfiles=("$HOME/.bashrc $HOME/.profile $HOME/.bash_profile $HOME/.bash_login") + cfiles=("$FAKEHOME/.cshrc $FAKEHOME/.tcshrc $FAKEHOME/.login") + bfiles=("$FAKEHOME/.bashrc $FAKEHOME/.profile $FAKEHOME/.bash_profile $FAKEHOME/.bash_login") for file in ${cfiles[@]}; do if [ -e "$file" ]; then |