From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 17 May 2009 09:48:21 +0000 (+0200)
Subject: Moved bash startup files to subdir.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=052b78b59cffb242a17f659d1ce34ab3600affff;p=ipfire-3.x.git

Moved bash startup files to subdir.
---

diff --git a/config/etc/bashrc b/config/bash/bashrc
similarity index 100%
rename from config/etc/bashrc
rename to config/bash/bashrc
diff --git a/config/etc/inputrc b/config/bash/inputrc
similarity index 100%
rename from config/etc/inputrc
rename to config/bash/inputrc
diff --git a/config/etc/profile b/config/bash/profile
similarity index 100%
rename from config/etc/profile
rename to config/bash/profile
diff --git a/config/profile.d/dircolors.sh b/config/bash/profile.d/dircolors.sh
similarity index 100%
rename from config/profile.d/dircolors.sh
rename to config/bash/profile.d/dircolors.sh
diff --git a/config/profile.d/extrapaths.sh b/config/bash/profile.d/extrapaths.sh
similarity index 100%
rename from config/profile.d/extrapaths.sh
rename to config/bash/profile.d/extrapaths.sh
diff --git a/config/profile.d/i18n.sh b/config/bash/profile.d/i18n.sh
similarity index 100%
rename from config/profile.d/i18n.sh
rename to config/bash/profile.d/i18n.sh
diff --git a/config/profile.d/readline.sh b/config/bash/profile.d/readline.sh
similarity index 100%
rename from config/profile.d/readline.sh
rename to config/bash/profile.d/readline.sh
diff --git a/config/profile.d/umask.sh b/config/bash/profile.d/umask.sh
similarity index 100%
rename from config/profile.d/umask.sh
rename to config/bash/profile.d/umask.sh
diff --git a/config/etc/shells b/config/bash/shells
similarity index 100%
rename from config/etc/shells
rename to config/bash/shells
diff --git a/lfs/bash b/lfs/bash
index 0e6adef8d..2c6647c54 100644
--- a/lfs/bash
+++ b/lfs/bash
@@ -133,10 +133,7 @@ ifeq "$(STAGE)" "base"
 	cd $(DIR_APP) && make install
 
 	# Bash startup files
-	install --directory --mode=0755 --owner=root --group=root /etc/profile.d
-	for i in $(DIR_CONFIG)/profile.d/*; do \
-	    [ -f $$i ] && cp $$i /etc/profile.d; \
-	done
+	cp -avf $(DIR_CONFIG)/bash/{bashrc,inputrc,profile,profile.d,shells} /etc
 endif
 
 	@rm -rf $(DIR_APP)