Update of /cvsroot/fink/fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30416
Modified Files:
pathsetup.sh.in ChangeLog
Log Message:
Chown the modified shell startup script, and prevent eating of $'s in here-doc.
Hopefully the next binary installer will run more smoothly with this.
Index: pathsetup.sh.in
===================================================================
RCS file: /cvsroot/fink/fink/pathsetup.sh.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- pathsetup.sh.in 2 Jan 2005 15:50:15 -0000 1.5
+++ pathsetup.sh.in 15 Oct 2005 19:25:43 -0000 1.6
@@ -1,7 +1,7 @@
#!/bin/sh
#
# Shell script for preparing the user's shell startup scripts for Fink.
-# Copyright (c) 2003-2004 Martin Costabel
+# Copyright (c) 2003-2005 Martin Costabel
# Copyright (c) 2003-2005 The Fink Package Manager Team
#
# This program is free software; you can redistribute it and/or
@@ -37,7 +37,7 @@
# PATH and SHELL are written into TMPFILE.
# 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
+ /usr/bin/login -f $USER >$TMPFILE <<"EOF"
/bin/echo -n LOGINSHELL=
/usr/bin/printenv SHELL
/usr/bin/printenv PATH
@@ -164,6 +164,7 @@
if [ "$answer" != "No, thanks" ]; then
echo "" >> $HOME/$RC
echo "$SOURCECMD" >> $HOME/$RC
+ chown $USER $HOME/$RC
do_login_test
if grep @PREFIX@/sbin $TMPFILE >/dev/null 2>&1 ; then
Result="\n Your Fink setup should be fine now.\n\n"
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/ChangeLog,v
retrieving revision 1.374
retrieving revision 1.375
diff -u -d -r1.374 -r1.375
--- ChangeLog 12 Oct 2005 06:26:41 -0000 1.374
+++ ChangeLog 15 Oct 2005 19:25:43 -0000 1.375
@@ -1,3 +1,10 @@
+2005-10-15 Martin Costabel <[EMAIL PROTECTED]>
+
+ * pathsetup.sh.in: Fix two bugs that have been annoying users
+ running the Fink binary installer for the first time:
+ The creation of a bash startup script with wrong root ownership,
+ and a wrong failure message.
+
2005-10-12 Daniel Macks <[EMAIL PROTECTED]>
* install.sh: perlmod/Fink/Tie was backed out. Fix buildlock dir.
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
