[Pkg-mono-svn-commits] rev 2361 - in cli-common/trunk: . debian

[D. Moonfire]

Author: dmoonfire-guest
Date: 2006-03-24 20:24:45 +0000 (Fri, 24 Mar 2006)
New Revision: 2361

Modified:
   cli-common/trunk/debian/dirs
   cli-common/trunk/gac-install
   cli-common/trunk/gac-package-install
   cli-common/trunk/gac-package-remove
   cli-common/trunk/gac-remove
Log:
Converted the entire mapping.d, install-gac.d, and remove-gac.d into a single
file version stored in runtime.d.


Modified: cli-common/trunk/debian/dirs
===================================================================
--- cli-common/trunk/debian/dirs	2006-03-24 19:27:37 UTC (rev 2360)
+++ cli-common/trunk/debian/dirs	2006-03-24 20:24:45 UTC (rev 2361)
@@ -1,4 +1,2 @@
-usr/lib/cli-common/mapping.d
-usr/lib/cli-common/install-gac.d
-usr/lib/cli-common/remove-gac.d
+usr/lib/cli-common/runtimes.d
 usr/lib/cli-common/packages.d

Modified: cli-common/trunk/gac-install
===================================================================
--- cli-common/trunk/gac-install	2006-03-24 19:27:37 UTC (rev 2360)
+++ cli-common/trunk/gac-install	2006-03-24 20:24:45 UTC (rev 2361)
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Make sure the GAC file exists
-if [ ! -x /usr/lib/cli-common/install-gac.d/$1 ]; then
+if [ ! -x /usr/lib/cli-common/runtimes.d/$1 ]; then
     echo E: Cannot install GAC $1
     exit 1
 fi

Modified: cli-common/trunk/gac-package-install
===================================================================
--- cli-common/trunk/gac-package-install	2006-03-24 19:27:37 UTC (rev 2360)
+++ cli-common/trunk/gac-package-install	2006-03-24 20:24:45 UTC (rev 2361)
@@ -100,7 +100,7 @@
 }
 
 # Go through the installation targets
-foreach my $clr (glob("/usr/lib/cli-common/install-gac.d/*"))
+foreach my $clr (glob("/usr/lib/cli-common/runtimes.d/*"))
 {
     # Ignore temporary files
     next if $clr =~ /~$/;
@@ -144,5 +144,5 @@
 
     #print "D: ", join(", ", @install), "\n";
     print STDERR "I: Installing $t from $pkg into $formal\n";
-    system($clr, $pkg, @install);
+    system($clr, "install", $pkg, @install);
 }

Modified: cli-common/trunk/gac-package-remove
===================================================================
--- cli-common/trunk/gac-package-remove	2006-03-24 19:27:37 UTC (rev 2360)
+++ cli-common/trunk/gac-package-remove	2006-03-24 20:24:45 UTC (rev 2361)
@@ -1,17 +1,13 @@
 #!/bin/bash
 
-for file in /usr/lib/cli-common/remove-gac.d/*
+for file in /usr/lib/cli-common/runtimes.d/*
   do	
   if [ -x $file ]; then
       # Figure out the formal name
-      B="$(basename $file)"
-      F=$B
+      F="$($file name)"
 
-      if [ -f /usr/lib/cli-common/mapping.d/$B ]; then
-	  F=$(cat /usr/lib/cli-common/mapping.d/$B)
-      fi
-
+      # Remove it
       echo "Removing $1 from $F"
-      $file $1
+      $file remove $1
   fi
 done

Modified: cli-common/trunk/gac-remove
===================================================================
--- cli-common/trunk/gac-remove	2006-03-24 19:27:37 UTC (rev 2360)
+++ cli-common/trunk/gac-remove	2006-03-24 20:24:45 UTC (rev 2361)
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if [ ! -x /usr/lib/cli-common/remove-gac.d/$1 ]; then
+if [ ! -x /usr/lib/cli-common/runtimes.d/$1 ]; then
     echo E: Cannot remove GAC $1
     exit 1
 fi
@@ -10,6 +10,6 @@
 for file in /usr/lib/cli-common/packages.d/*.installcligac
 do
   if [ -f $file ]; then
-      /usr/lib/cli-common/remove-gac.d/$1 $(basename $file .installcligac)
+      /usr/lib/cli-common/runtimes.d/$1 remove $(basename $file .installcligac)
   fi
 done