提交: 9cfbc5c87995b7216de3ff5f91a93a2dab5b8e9a - LFScripts (git)

Commit MetaInfo

• 修訂: 9cfbc5c87995b7216de3ff5f91a93a2dab5b8e9a (tree)
• 時間: 2012-02-25 23:15:06
• 作者: matsuand <matsuand@user...>
• Commiter: matsuand

Log Message

Modified a little.

Change Summary

• modified: BLFS/_blfsset.sh
• modified: BLFS/bash-completion.sh
• modified: BLFS/bash_shell_startup_files.sh

差異

--- a/BLFS/_blfsset.sh
+++ b/BLFS/_blfsset.sh
@@ -3,7 +3,7 @@
 LFS=/mnt/lfs
 SRC=$LFS/sources/BLFS
 DLD=$LFS/download/BLFS
-WRK=$LFS/work/BLFS
+WRK=$LFS/work/LFScripts/BLFS
 LOG=$WRK/log
 
 BOOTSCRIPTDATE=20120217

--- a/BLFS/bash-completion.sh
+++ b/BLFS/bash-completion.sh
@@ -29,28 +29,28 @@ fi
 
 cd $TARGETDIR
 
-paco -p $TARGET "\
+sudo paco -p $TARGET "\
 install -m644 bash_completion.sh /etc/profile.d/70-bash_completion.sh"
 
-paco -p+ $TARGET "\
+sudo paco -p+ $TARGET "\
 cp -v bash_completion /etc"
 
-paco -p+ $TARGET "\
+sudo paco -p+ $TARGET "\
 install -d /etc/bash_completion.d"
 
-paco -p+ $TARGET "\
+sudo paco -p+ $TARGET "\
 install -d /usr/share/bash-completion"
 
-paco -p+ $TARGET "\
+sudo paco -p+ $TARGET "\
 cp -v contrib/* /usr/share/bash-completion"
 
-paco -p+ $TARGET "\
+sudo paco -p+ $TARGET "\
 install -d /usr/share/doc/bash-completion"
 
-paco -p+ $TARGET "\
+sudo paco -p+ $TARGET "\
 cp -v README /usr/share/doc/bash-completion"
 
-cat >> /etc/bashrc << "EOF"
+sudo cat >> /etc/bashrc << "EOF"
 # Enable bash completion
 if [ -f /etc/bash_completion ]; then
   source /etc/bash_completion

--- a/BLFS/bash_shell_startup_files.sh
+++ b/BLFS/bash_shell_startup_files.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-cat > /etc/profile << "EOF"
+sudo cat > /etc/profile << "EOF"
 # Begin /etc/profile
 # Written for Beyond Linux From Scratch
 # by James Robertson <[e-mail]>
@@ -75,9 +75,9 @@ unset pathremove pathprepend pathappend
 # End /etc/profile
 EOF
 
-install --directory --mode=0755 --owner=root --group=root /etc/profile.d
+sudo install --directory --mode=0755 --owner=root --group=root /etc/profile.d
 
-cat > /etc/profile.d/dircolors.sh << "EOF"
+sudo cat > /etc/profile.d/dircolors.sh << "EOF"
 # Setup for /bin/ls to support color, the alias is in /etc/bashrc.
 if [ -f "/etc/dircolors" ] ; then
         eval $(dircolors -b /etc/dircolors)
@@ -89,7 +89,7 @@ fi
 alias ls='ls --color=auto'
 EOF
 
-cat > /etc/profile.d/extrapaths.sh << "EOF"
+sudo cat > /etc/profile.d/extrapaths.sh << "EOF"
 if [ -d /usr/local/lib/pkgconfig ] ; then
         pathappend /usr/local/lib/pkgconfig PKG_CONFIG_PATH
 fi
@@ -108,7 +108,7 @@ fi
 #fi
 EOF
 
-cat > /etc/profile.d/readline.sh << "EOF"
+sudo cat > /etc/profile.d/readline.sh << "EOF"
 # Setup the INPUTRC environment variable.
 if [ -z "$INPUTRC" -a ! -f "$HOME/.inputrc" ] ; then
         INPUTRC=/etc/inputrc
@@ -116,7 +116,7 @@ fi
 export INPUTRC
 EOF
 
-cat > /etc/profile.d/umask.sh << "EOF"
+sudo cat > /etc/profile.d/umask.sh << "EOF"
 # By default we want the umask to get set.
 if [ "$(id -gn)" = "$(id -un)" -a $EUID -gt 99 ] ; then
   umask 002
@@ -125,7 +125,7 @@ else
 fi
 EOF
 
-cat > /etc/profile.d/X.sh << "EOF"
+sudo cat > /etc/profile.d/X.sh << "EOF"
 if [ -x /usr/X11/bin/X ]; then
         pathappend /usr/X11/bin
 fi
@@ -134,12 +134,12 @@ if [ -d /usr/X11/lib/pkgconfig ] ; then
 fi
 EOF
 
-cat > /etc/profile.d/i18n.sh << "EOF"
+sudo cat > /etc/profile.d/i18n.sh << "EOF"
 # Set up i18n variables
 export LANG=ja_JP.UTF-8
 EOF
 
-cat > /etc/bashrc << "EOF"
+sudo cat > /etc/bashrc << "EOF"
 # Begin /etc/bashrc
 # Written for Beyond Linux From Scratch
 # by James Robertson <[e-mail]>
@@ -176,7 +176,7 @@ fi
 export LFS=/mnt/lfs
 EOF
 
-cat > ~/.bash_profile << "EOF"
+sudo cat > /root/.bash_profile << "EOF"
 # Begin ~/.bash_profile
 # Written for Beyond Linux From Scratch
 # by James Robertson <[e-mail]>
@@ -215,7 +215,7 @@ unset append
 # End ~/.bash_profile
 EOF
 
-cat > ~/.bashrc << "EOF"
+sudo cat > /root/.bashrc << "EOF"
 # Begin ~/.bashrc
 # Written for Beyond Linux From Scratch
 # by James Robertson <[e-mail]>
@@ -243,7 +243,7 @@ export XORG_CONFIG="--prefix=$XORG_PREFIX --sysconfdir=/etc \
 export PKG_CONFIG_PATH=$XORG_PREFIX/lib/pkgconfig
 EOF
 
-cat > ~/.bash_logout << "EOF"
+sudo cat > /root/.bash_logout << "EOF"
 # Begin ~/.bash_logout
 # Written for Beyond Linux From Scratch
 # by James Robertson <[e-mail]>
@@ -253,11 +253,11 @@ cat > ~/.bash_logout << "EOF"
 # End ~/.bash_logout
 EOF
 
-dircolors -p > /etc/dircolors
+sudo dircolors -p > /etc/dircolors
 
-mkdir -pv /etc/skel
-cp /root/.bashrc /etc/skel
-cp /root/.bash_profile /etc/skel
-cp /root/.bash_logout /etc/skel
-cp /root/.viminfo /etc/skel
+sudo mkdir -pv /etc/skel
+sudo cp /root/.bashrc /etc/skel
+sudo cp /root/.bash_profile /etc/skel
+sudo cp /root/.bash_logout /etc/skel
+sudo cp /root/.viminfo /etc/skel