Changeset dd8be9e for postlfs

Timestamp:

08/18/2014 10:48:37 AM (10 years ago)

Author:

Krejzi <krejzi@…>

Branches:

systemd-11177

Children:

29b3453

Parents:

d312fbb3

Message:

Merge one forgotten commit.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@13944 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• postlfs/config/profile-systemd.xml (modified) (6 diffs)

postlfs/config/profile-systemd.xml

@@ -162 +162 @@
 done
 
+uset script RED GREEN NORMAL
+
 # End /etc/profile</literal>
 EOF</userinput></screen>
@@ -214 +216 @@
       </indexterm>
 
-      <para>This script adds several useful paths to the <envar>PATH</envar> and
-      <envar>PKG_CONFIG_PATH</envar> environment variables.  If you want, you
-      can uncomment the last section to put a dot at the end of your path. This will
-      allow executables in the current working directory to be executed without
-      specifying a ./, however you are warned that this is generally considered a
-      security hazard.</para>
+      <para>This script adds some useful paths to the <envar>PATH</envar> and
+      can be used to customize other PATH related environment variables
+      (e.g. LD_LIBRARY_PATH, etc) that may be needed for all users.</para> 
 
 <screen role="root"><userinput>cat &gt; /etc/profile.d/extrapaths.sh &lt;&lt; "EOF"
@@ -230 +229 @@
 if [ -d /usr/local/sbin -a $EUID -eq 0 ]; then
         pathprepend /usr/local/sbin
-fi
-
-if [ -d ~/bin ]; then
-        pathprepend ~/bin
-fi
-#if [ $EUID -gt 99 ]; then
-#        pathappend .
-#fi</literal>
+fi</literal>
 EOF</userinput></screen>
 
@@ -402 +394 @@
 fi
 
+unset RED GREEN NORMAL
+
 # End /etc/bashrc</literal>
 EOF</userinput></screen>
@@ -434 +428 @@
 # System wide aliases and functions are in /etc/bashrc.
 
-append () {
-  # First remove the directory
-  local IFS=':'
-  local NEWPATH
-  for DIR in $PATH; do
-     if [ "$DIR" != "$1" ]; then
-       NEWPATH=${NEWPATH:+$NEWPATH:}$DIR
-     fi
-  done
-
-  # Then append the directory
-  export PATH=$NEWPATH:$1
-}
-
 if [ -f "$HOME/.bashrc" ] ; then
   source $HOME/.bashrc
@@ -453 +433 @@
 
 if [ -d "$HOME/bin" ] ; then
-  append $HOME/bin
-fi
-
-unset append
+  pathprepend $HOME/bin
+fi
+
+# Having . in the PATH is dangerous
+#if [ $EUID -gt 99 ]; then
+#  pathappend .
+#fi
 
 # End ~/.bash_profile</literal>