Add more FAKEHOME fixesHEADmaster

21 files changed, 86 insertions, 81 deletions

diff --git a/install b/install
index 09fa0188..fab7ecb6 100755
--- a/install
+++ b/install
@@ -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
diff --git a/unix/hlib/setup.csh b/unix/hlib/setup.csh
index b51a1950..6a826c75 100755
--- a/unix/hlib/setup.csh
+++ b/unix/hlib/setup.csh
@@ -11,7 +11,7 @@ if ( ! ( $?IRAFARCH )) then
 endif
 source $iraf/unix/hlib/irafuser.csh
 
-set path = ($HOME/.iraf/bin $path)
+set path = ($FAKEHOME/bin $path)
 set cdpath  = ($iraf $iraf/pkg $iraf/noao $iraf/sys $iraf/unix $iraf/unix/boot)
 
 # The world'd most obvious alias ....
diff --git a/util/check_update b/util/check_update
index b1973b8c..e42941a6 100755
--- a/util/check_update
+++ b/util/check_update
@@ -6,8 +6,8 @@
 
 # Initialize the $iraf and environment.
 if [ -z "$iraf" ]; then
-  if [ -e "$HOME/.iraf/setup.sh" ]; then
-    source $HOME/.iraf/setup.sh
+  if [ -e "$FAKEHOME/setup.sh" ]; then
+    source $FAKEHOME/setup.sh
   else
     source unix/hlib/setup.sh
   fi
diff --git a/util/fget b/util/fget
index 828f2463..95f51d17 100755
--- a/util/fget
+++ b/util/fget
@@ -42,8 +42,8 @@ if [ -n "$iraf" ]; then
 fi
 # Initialize the $iraf and environment.
 if [ -z "$iraf" ]; then
-  if [ -e "$HOME/.iraf/setup.sh" ]; then
-    source $HOME/.iraf/setup.sh
+  if [ -e "$FAKEHOME/setup.sh" ]; then
+    source $FAKEHOME/setup.sh
   else
     source ../unix/hlib/setup.sh
   fi
diff --git a/util/iraf_latest b/util/iraf_latest
index 32462113..dde0e07d 100755
--- a/util/iraf_latest
+++ b/util/iraf_latest
@@ -15,8 +15,8 @@ fi
 
 # Initialize the $iraf and environment.
 if [ -z "$iraf" ]; then
-  if [ -e "$HOME/.iraf/setup.sh" ]; then
-    source $HOME/.iraf/setup.sh
+  if [ -e "$FAKEHOME/setup.sh" ]; then
+    source $FAKEHOME/setup.sh
   else
     source unix/hlib/setup.sh
   fi
diff --git a/util/iraf_update b/util/iraf_update
index fb0f1a3f..81cde518 100755
--- a/util/iraf_update
+++ b/util/iraf_update
@@ -65,8 +65,8 @@ fi
 
 # Initialize the $iraf and environment.
 if [ -z "$iraf" ]; then
-  if [ -e "$HOME/.iraf/setup.sh" ]; then
-    source $HOME/.iraf/setup.sh
+  if [ -e "$FAKEHOME/setup.sh" ]; then
+    source $FAKEHOME/setup.sh
   else
     source unix/hlib/setup.sh
   fi
diff --git a/util/mkarch b/util/mkarch
index 733dc04f..22d6589f 100755
--- a/util/mkarch
+++ b/util/mkarch
@@ -6,8 +6,8 @@
 
 # Initialize the $iraf and environment.
 if [ -z "$iraf" ]; then
-  if [ -e "$HOME/.iraf/setup.sh" ]; then
-    source $HOME/.iraf/setup.sh
+  if [ -e "$FAKEHOME/setup.sh" ]; then
+    source $FAKEHOME/setup.sh
   else
     source unix/hlib/setup.sh
   fi
@@ -73,6 +73,6 @@ while [ "$loop_" == "yes" ]; do
   fi
 done
 
-if [ -e "$HOME/.iraf/arch" ]; then
-    echo $arch > $HOME/.iraf/arch
+if [ -e "$FAKEHOME/arch" ]; then
+    echo $arch > $FAKEHOME/arch
 fi
diff --git a/util/mkbindist b/util/mkbindist
index 0e1b978f..abdf6b08 100755
--- a/util/mkbindist
+++ b/util/mkbindist
@@ -5,8 +5,8 @@ export 	PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/5bin:/usr/ucb:/etc:/usr/etc:$PAT
 
 # Initialize the $iraf and environment.
 if [ -z "$iraf" ]; then
-  if [ -e "$HOME/.iraf/setup.sh" ]; then
-    source $HOME/.iraf/setup.sh
+  if [ -e "$FAKEHOME/setup.sh" ]; then
+    source $FAKEHOME/setup.sh
   else
     source unix/hlib/setup.sh
   fi
diff --git a/util/mkclean b/util/mkclean
index 57aab395..fdb42f84 100755
--- a/util/mkclean
+++ b/util/mkclean
@@ -8,8 +8,8 @@ export 	PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/5bin:/usr/ucb:/etc:/usr/etc:$PAT
 
 # Initialize the $iraf and environment.
 if [ -z "$iraf" ]; then
-  if [ -e "$HOME/.iraf/setup.sh" ]; then
-    source $HOME/.iraf/setup.sh
+  if [ -e "$FAKEHOME/setup.sh" ]; then
+    source $FAKEHOME/setup.sh
   else
     source unix/hlib/setup.sh
   fi
diff --git a/util/mkproto b/util/mkproto
index 195bbba6..71493df4 100755
--- a/util/mkproto
+++ b/util/mkproto
@@ -16,8 +16,8 @@ tproto=/tmp/_vosproto.$$
 
 # Initialize the $iraf and environment.
 if [ -z "$iraf" ]; then
-  if [ -e "$HOME/.iraf/setup.sh" ]; then
-    source $HOME/.iraf/setup.sh
+  if [ -e "$FAKEHOME/setup.sh" ]; then
+    source $FAKEHOME/setup.sh
   else
     source unix/hlib/setup.sh
   fi
diff --git a/util/mksrc b/util/mksrc
index ba22dca4..a57693ed 100755
--- a/util/mksrc
+++ b/util/mksrc
@@ -6,8 +6,8 @@
 
 # Initialize the $iraf and environment.
 if [ -z "$iraf" ]; then
-  if [ -e "$HOME/.iraf/setup.sh" ]; then
-    source $HOME/.iraf/setup.sh
+  if [ -e "$FAKEHOME/setup.sh" ]; then
+    source $FAKEHOME/setup.sh
   else
     source unix/hlib/setup.sh
   fi
diff --git a/util/mksysgen b/util/mksysgen
index 48c4b338..7e3679b5 100755
--- a/util/mksysgen
+++ b/util/mksysgen
@@ -3,8 +3,8 @@
 
 # Initialize the $iraf and environment.
 if [ -z "$iraf" ]; then
-  if [ -e "$HOME/.iraf/setup.sh" ]; then
-    source $HOME/.iraf/setup.sh
+  if [ -e "$FAKEHOME/setup.sh" ]; then
+    source $FAKEHOME/setup.sh
   else
     source unix/hlib/setup.sh
   fi
@@ -22,12 +22,12 @@ if [ -z "$iraf" ]; then
     iraf=`pwd`/
 fi
 
-if [ -e "$HOME/.iraf/arch" ]; then
+if [ -e "$FAKEHOME/arch" ]; then
   if [ -n "$IRAFARCH" ]; then
-    iarch=`cat $HOME/.iraf/arch`
+    iarch=`cat $FAKEHOME/arch`
     if [ "$iarch" != "$IRAFARCH" ]; then
       /bin/echo ""
-      /bin/echo 'Error:  Your $IRAFARCH does not match $HOME/.iraf/arch,'
+      /bin/echo 'Error:  Your $IRAFARCH does not match $FAKEHOME/arch,'
       /bin/echo '        Please change $IRAFARCH or rerun install script.'
       /bin/echo ""
       exit 1
diff --git a/util/mkup b/util/mkup
index ed4499f5..9867caad 100755
--- a/util/mkup
+++ b/util/mkup
@@ -3,8 +3,8 @@
 
 # Initialize the $iraf and environment.
 if [ -z "$iraf" ]; then
-  if [ -e "$HOME/.iraf/setup.sh" ]; then
-    source $HOME/.iraf/setup.sh
+  if [ -e "$FAKEHOME/setup.sh" ]; then
+    source $FAKEHOME/setup.sh
   else
     source unix/hlib/setup.sh
   fi
diff --git a/util/mkupx b/util/mkupx
index 126c3e8d..71cace76 100755
--- a/util/mkupx
+++ b/util/mkupx
@@ -3,8 +3,8 @@
 
 # Initialize the $iraf and environment.
 if [ -z "$iraf" ]; then
-  if [ -e "$HOME/.iraf/setup.sh" ]; then
-    source $HOME/.iraf/setup.sh
+  if [ -e "$FAKEHOME/setup.sh" ]; then
+    source $FAKEHOME/setup.sh
   else
     source unix/hlib/setup.sh
   fi
diff --git a/util/pkgconfig b/util/pkgconfig
index e5e6c513..14b22b38 100755
--- a/util/pkgconfig
+++ b/util/pkgconfig
@@ -6,8 +6,8 @@
 
 # Initialize the $iraf and environment.
 if [ -z "$iraf" ]; then
-  if [ -e "$HOME/.iraf/setup.sh" ]; then
-    source $HOME/.iraf/setup.sh
+  if [ -e "$FAKEHOME/setup.sh" ]; then
+    source $FAKEHOME/setup.sh
   else
     source unix/hlib/setup.sh
   fi
diff --git a/util/pkgdel b/util/pkgdel
index f7d52568..a2f47bc1 100755
--- a/util/pkgdel
+++ b/util/pkgdel
@@ -8,8 +8,8 @@ irafdir=${bindir%/*}
 
 # Initialize the $iraf and environment.
 if [ -z "$iraf" ]; then
-  if [ -e "$HOME/.iraf/setup.sh" ]; then
-    source $HOME/.iraf/setup.sh
+  if [ -e "$FAKEHOME/setup.sh" ]; then
+    source $FAKEHOME/setup.sh
   else
     source ../unix/hlib/setup.sh
   fi
diff --git a/util/pkgget b/util/pkgget
index fba02c04..ef3acc43 100755
--- a/util/pkgget
+++ b/util/pkgget
@@ -20,8 +20,8 @@ export 	PATH=../util:$PATH
 
 # Initialize the $iraf and environment.
 if [ -z "$iraf" ]; then
-  if [ -e "$HOME/.iraf/setup.sh" ]; then
-    source $HOME/.iraf/setup.sh
+  if [ -e "$FAKEHOME/setup.sh" ]; then
+    source $FAKEHOME/setup.sh
   else
     source ../unix/hlib/setup.sh
   fi
diff --git a/util/pkginit b/util/pkginit
index a484d522..7259be76 100755
--- a/util/pkginit
+++ b/util/pkginit
@@ -8,8 +8,8 @@ irafdir=${bindir%/*}
 
 # Initialize the $iraf and environment.
 if [ -z "$iraf" ]; then
-  if [ -e "$HOME/.iraf/setup.sh" ]; then
-    source $HOME/.iraf/setup.sh
+  if [ -e "$FAKEHOME/setup.sh" ]; then
+    source $FAKEHOME/setup.sh
   else
     source ../unix/hlib/setup.sh
   fi
diff --git a/util/pkginst b/util/pkginst
index d4a83a24..22672f1b 100755
--- a/util/pkginst
+++ b/util/pkginst
@@ -13,8 +13,8 @@ irafdir=${bindir%/*}
 
 # Initialize the $iraf and environment.
 if [ -z "$iraf" ]; then
-  if [ -e "$HOME/.iraf/setup.sh" ]; then
-    source $HOME/.iraf/setup.sh
+  if [ -e "$FAKEHOME/setup.sh" ]; then
+    source $FAKEHOME/setup.sh
   else
     source ../unix/hlib/setup.sh
   fi
diff --git a/util/pkgupdate b/util/pkgupdate
index ea73ec1b..abf079dd 100755
--- a/util/pkgupdate
+++ b/util/pkgupdate
@@ -35,8 +35,8 @@ irafdir=${bindir%/*}
 
 # Initialize the $iraf and environment.
 if [ -z "$iraf" ]; then
-  if [ -e "$HOME/.iraf/setup.sh" ]; then
-    source $HOME/.iraf/setup.sh
+  if [ -e "$FAKEHOME/setup.sh" ]; then
+    source $FAKEHOME/setup.sh
   else
     source ../unix/hlib/setup.sh
   fi
diff --git a/util/self_update b/util/self_update
index f5896d44..8e438909 100755
--- a/util/self_update
+++ b/util/self_update
@@ -5,8 +5,8 @@
 
 # Initialize the $iraf and environment.
 if [ -z "$iraf" ]; then
-  if [ -e "$HOME/.iraf/setup.sh" ]; then
-    source $HOME/.iraf/setup.sh
+  if [ -e "$FAKEHOME/setup.sh" ]; then
+    source $FAKEHOME/setup.sh
   else
     source unix/hlib/setup.sh
   fi