wilde: server install-kolab.sh,1.36,1.37

cvs at kolab.org cvs at kolab.org
Fri Jul 4 18:41:46 CEST 2008


Author: wilde

Update of /kolabrepository/server
In directory doto:/tmp/cvs-serv16916

Modified Files:
	install-kolab.sh 
Log Message:
Fixed my last check in: 
the new `-x' option messed with the order of the package list which
caused openpkg to fail...


Index: install-kolab.sh
===================================================================
RCS file: /kolabrepository/server/install-kolab.sh,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- install-kolab.sh	4 Jul 2008 16:02:13 -0000	1.36
+++ install-kolab.sh	4 Jul 2008 16:41:44 -0000	1.37
@@ -84,8 +84,19 @@
 }
 
 remove_from_list() {
-# Return list with all elements which ar in $1 and $2 removed.
-  echo "$1" "$2" | tr " " "\n" | sort | uniq -u | tr "\n" " "
+# Return list $2 with all elements which ar in list $1 removed.
+  newlist=""
+  for element in $2 ; do
+    delelt=""
+    for remove in $1 ; do
+      if [ "$element" = "$remove" ] ; then
+        delelt="t"
+        break
+      fi      
+    done
+    [ "$delelt" ] || newlist="$newlist $element"
+  done
+  echo "$newlist"
 }
 
 while getopts hcBXE:V:p:I:u:t:O:x: ARGS; do





More information about the commits mailing list