Update of /cvsroot/fink/fink
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv10233

Modified Files:
      Tag: branch_0_27
        pathsetup.sh.in 
Log Message:
Sync with HEAD

Index: pathsetup.sh.in
===================================================================
RCS file: /cvsroot/fink/fink/pathsetup.sh.in,v
retrieving revision 1.9.6.1
retrieving revision 1.9.6.2
diff -u -d -r1.9.6.1 -r1.9.6.2
--- pathsetup.sh.in     2 Jan 2008 01:50:25 -0000       1.9.6.1
+++ pathsetup.sh.in     17 Jan 2008 08:09:58 -0000      1.9.6.2
@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA.
 #
 
 
@@ -29,6 +29,7 @@
 # Test whether we can use Finder popup windows
     ONCONSOLE=NO
     /bin/ps x -U $USER | grep Finder | grep -v grep >/dev/null && ONCONSOLE=YES
+    [ "x`/usr/bin/printenv SSH_TTY`" = "x`/usr/bin/tty`" ] && ONCONSOLE=NO
     [ "x$SCRIPT_NAME" = "xpostflight" ] && ONCONSOLE=YES 
 }
 
@@ -38,10 +39,10 @@
 # We have to use basic shell speak here, because we don't know
 # which shell will come up.
     /usr/bin/login -f $USER >$TMPFILE <<"EOF"
-    /bin/echo -n LOGINSHELL= 
+    /usr/bin/printf "LOGINSHELL=" 
     /usr/bin/printenv SHELL
     /usr/bin/printenv PATH
-    /bin/bash --norc --noprofile <<EOF2
+    /bin/bash --norc --noprofile <<"EOF2"
 #   For bash, we need a second opinion. 
 #   We do the test for bash inside bash.
     if test $(/bin/echo $SHELL | /usr/bin/grep bash); then
@@ -103,7 +104,7 @@
     ;;
     esac
     echo
-    /bin/echo -n Continue\?
+    /usr/bin/printf "Continue?"
 }
 
 display_choose () {
@@ -123,7 +124,7 @@
     msg_title; echo "Your login shell: $LOGINSHELL"; echo ""
     $MSG; echo ""
     msg_choose
-    /bin/echo -n " [Y/n] "
+    /usr/bin/printf " [Y/n] "
     read -t 20 answer
     answer=`echo $answer | sed 's/^[yY].*$/y/'`
     if [ ! -z "$answer" -a "x$answer" != "xy" ]; then
@@ -146,7 +147,7 @@
 EOF
    ;;
        NO)
-   printf "$Result" 
+   /usr/bin/printf "$Result" 
    ;;
     esac
 }
@@ -299,3 +300,4 @@
 rm -f $TMPFILE
 
 # End of program.
+


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to