[Lunar-commits] r26924 - in moonbase/trunk/utils: coreutils theedge/profile.d

[Stefan Wold]

Author: ratler
Date: 2007-11-26 14:43:59 +0100 (Mon, 26 Nov 2007)
New Revision: 26924

Modified:
   moonbase/trunk/utils/coreutils/BUILD
   moonbase/trunk/utils/theedge/profile.d/theedge.rc
Log:
theedge
* Add completion for lvu conflicts
coreutils
* Don't install 'groups', conflicts with shadow module
* Don't remove /usr/bin/su since heimdal install that file


Modified: moonbase/trunk/utils/coreutils/BUILD
===================================================================
--- moonbase/trunk/utils/coreutils/BUILD	2007-11-26 11:05:05 UTC (rev 26923)
+++ moonbase/trunk/utils/coreutils/BUILD	2007-11-26 13:43:59 UTC (rev 26924)
@@ -27,7 +27,7 @@
 
   (
     for FILE in basename cat cp chgrp chmod chown cut date dd df echo false   \
-                groups head id ln ls mkdir mknod nice pwd rm rmdir sleep sort \
+                head id ln ls mkdir mknod nice pwd rm rmdir sleep sort \
                 stty sync tail tr true uname ; do
       if [ -f /usr/bin/$FILE ] ; then
         /bin/mv -f /usr/bin/$FILE /bin
@@ -41,7 +41,6 @@
     # also, bash will need to rehash, but doesn't:
     /bin/mv -f /usr/bin/chroot /usr/sbin  &&
     /bin/rm -f /usr/bin/hostname &&
-    /bin/rm -f /usr/bin/su
   )
 
 ) > $C_FIFO 2>&1

Modified: moonbase/trunk/utils/theedge/profile.d/theedge.rc
===================================================================
--- moonbase/trunk/utils/theedge/profile.d/theedge.rc	2007-11-26 11:05:05 UTC (rev 26923)
+++ moonbase/trunk/utils/theedge/profile.d/theedge.rc	2007-11-26 13:43:59 UTC (rev 26924)
@@ -22,14 +22,14 @@
 {
 	# List any lvu sub-commands that do not take a module name 
 	# after it
-        LVU_CMDS_WITH_NO_MODULE="leafs orphans alien held exiled export moonbase html updatelog activity pam expired"
+        LVU_CMDS_WITH_NO_MODULE="leafs orphans conflicts alien held exiled export moonbase html updatelog activity pam expired"
 	local cur prev
 	COMPREPLY=()
 	cur=${COMP_WORDS[COMP_CWORD]}
 	prev=${COMP_WORDS[COMP_CWORD-1]}
 
 	if [ $COMP_CWORD -eq 1 ] || [ "${prev:0:1}" = "-" ]; then
-		COMPREPLY=( $( compgen -W 'DETAILS DEPENDS CONFLICTS BUILD PRE_BUILD POST_BUILD CONFIGURE POST_INSTALL PRE_REMOVE POST_REMOVE what where cd alien from leafs orphans search service website install size installed compile compiler links sources maintainer version sum md5sum export import section moonbase html updatelog activity newer older voyeur pam expired depends tree eert stree leert held exiled urls versions short info edit unedit diff new submit' $cur ))
+		COMPREPLY=( $( compgen -W 'DETAILS DEPENDS CONFLICTS BUILD PRE_BUILD POST_BUILD CONFIGURE POST_INSTALL PRE_REMOVE POST_REMOVE what where cd alien from leafs orphans conflicts search service website install size installed compile compiler links sources maintainer version sum md5sum export import section moonbase html updatelog activity newer older voyeur pam expired depends tree eert stree leert held exiled urls versions short info edit unedit diff new submit' $cur ))
 	elif [ $COMP_CWORD -eq 2 -a $prev = "from" ]; then
 	        COMPREPLY=( $(compgen -f "$cur") )
 	elif [ $COMP_CWORD -eq 2 ]; then