[Demudi-commits] r201 - in demudi-cfengine/trunk: chunks debian scripts

[Free Ekanayaka]

Author: free-guest
Date: 2004-11-15 06:53:18 -0700 (Mon, 15 Nov 2004)
New Revision: 201

Added:
   demudi-cfengine/trunk/chunks/bash-etc_profile
Modified:
   demudi-cfengine/trunk/chunks/bash-etc_bash.bashrc
   demudi-cfengine/trunk/debian/changelog
   demudi-cfengine/trunk/scripts/bash
Log:
  * Edits /etc/profile to include /etc/bash.bashrc

Modified: demudi-cfengine/trunk/chunks/bash-etc_bash.bashrc
===================================================================
--- demudi-cfengine/trunk/chunks/bash-etc_bash.bashrc	2004-11-15 13:36:36 UTC (rev 200)
+++ demudi-cfengine/trunk/chunks/bash-etc_bash.bashrc	2004-11-15 13:53:18 UTC (rev 201)
@@ -20,3 +20,9 @@
     alias ll='ls -l'
     alias la='ls -A'
     alias l='ls -CF'
+
+    export HISTSIZE=50000
+
+    if [ -f /usr/share/doc/bash/examples/startup-files/bashrc ]; then
+        . /usr/share/doc/bash/examples/startup-files/bashrc
+    fi

Added: demudi-cfengine/trunk/chunks/bash-etc_profile
===================================================================
--- demudi-cfengine/trunk/chunks/bash-etc_profile	2004-11-15 13:36:36 UTC (rev 200)
+++ demudi-cfengine/trunk/chunks/bash-etc_profile	2004-11-15 13:53:18 UTC (rev 201)
@@ -0,0 +1,5 @@
+
+# Include system wide resource file
+if [ -f /etc/bash.bashrc ]; then
+	. /etc/bash.bashrc
+fi

Modified: demudi-cfengine/trunk/debian/changelog
===================================================================
--- demudi-cfengine/trunk/debian/changelog	2004-11-15 13:36:36 UTC (rev 200)
+++ demudi-cfengine/trunk/debian/changelog	2004-11-15 13:53:18 UTC (rev 201)
@@ -4,6 +4,7 @@
   * Using sarge snapshot 2004/11/13
   * Added the upgrade class
   * Setting Aterm as default X terminal emulator
+  * Edits /etc/profile to include /etc/bash.bashrc
 
  -- Free Ekanayaka <free@agnula.org>  Tue,  9 Nov 2004 12:14:40 +0100
 

Modified: demudi-cfengine/trunk/scripts/bash
===================================================================
--- demudi-cfengine/trunk/scripts/bash	2004-11-15 13:36:36 UTC (rev 200)
+++ demudi-cfengine/trunk/scripts/bash	2004-11-15 13:53:18 UTC (rev 201)
@@ -1,23 +1,45 @@
 editfiles:
 
-    { /etc/skel/.bash_profile
+#    { /etc/skel/.bash_profile
+#
+#	SetCommentStart "#"
+#
+#	BeginGroupIfNoLineContaining "# include .bashrc if it exists"
+#		Append "# include .bashrc if it exists"
+#		Append "#if [ -f ~/.bashrc ]; then"
+#		Append "#    . ~/.bashrc"
+#		Append "#fi"
+#	EndGroup
+#
+#	LocateLineMatching ".*include .bashrc if it exists"
+#	IncrementPointer "1"
+#	UnCommentNLines "3"
+#
+#    }
 
+    { /etc/profile
+
 	SetCommentStart "#"
 
-	BeginGroupIfNoLineContaining "# include .bashrc if it exists"
-		Append "# include .bashrc if it exists"
-		Append "#if [ -f ~/.bashrc ]; then"
-		Append "#    . ~/.bashrc"
-		Append "#fi"
+	#
+	# Insert our chunk
+	#
+	BeginGroupIfNoLineContaining "$(begin)"
+		Append "$(begin)"
+		Append "$(end)"
+		GotoLastLine
+		IncrementPointer "-1"
 	EndGroup
 
-	LocateLineMatching ".*include .bashrc if it exists"
-	IncrementPointer "1"
-	UnCommentNLines "3"
+	LocateLineMatching "$(begin)"
+		InsertLine "$(comment)"
+		InsertFile "$(chunks)/bash-etc_profile"
+		IncrementPointer "1"
+	DeleteToLineMatching "$(end)"
 
     }
 
-    { /etc/skel/.bashrc
+    { /etc/bash.bashrc
 
 	SetCommentStart "#"
 
@@ -29,8 +51,8 @@
 	#
 	# Set smart bash completition
 	# 
-	LocateLineMatching ".*enable programmable completion features.*"
-	IncrementPointer "2"
+	LocateLineMatching ".*enable bash completion in interactive shells.*"
+	IncrementPointer "1"
 	UnCommentNLines "3"
 	IncrementPointer "-1"