# HG changeset patch
# User Thomas Weber <address@hidden>
# Date 1206389658 -3600
# Node ID 8fc0fd715b456754471ea6d0e44bc8a5f963c0de
# Parent  ec78d83a7fdea65c4572c4f2c82d6be37fcb67c8
Remove unnecessary for-loop

diff -r ec78d83a7fde -r 8fc0fd715b45 scripts/ChangeLog
--- a/scripts/ChangeLog	Mon Mar 24 12:06:52 2008 -0400
+++ b/scripts/ChangeLog	Mon Mar 24 21:14:18 2008 +0100
@@ -1,3 +1,7 @@ 2008-03-21  David Bateman  <address@hidden
+2008-03-24  Thomas Weber  <address@hidden>
+
+	* pkg/pkg.m: Remove unnecessary for-loop
+
 2008-03-21  David Bateman  <address@hidden>
 
 	* specfun/reallog.m, specfun/realpow.m, specfun/realsqrt.m: New
diff -r ec78d83a7fde -r 8fc0fd715b45 scripts/pkg/pkg.m
--- a/scripts/pkg/pkg.m	Mon Mar 24 12:06:52 2008 -0400
+++ b/scripts/pkg/pkg.m	Mon Mar 24 21:14:18 2008 +0100
@@ -601,7 +601,6 @@ function install (files, handle_deps, au
 	endif
 
 	## the two first entries of dirlist are "." and ".."
-	for k = 3:length (dirlist)
 	  packdir = fullfile (tmpdir, dirlist{k});
 	  packdirs{end+1} = packdir;
 
@@ -637,7 +636,6 @@ function install (files, handle_deps, au
 	      packages_to_uninstall(end+1) = j;
 	    endif
 	  endfor
-	endfor        
       endif
     endfor
   catch
# HG changeset patch
# User Thomas Weber <address@hidden>
# Date 1206354254 -3600
# Node ID 27cf2c0c5303d244aed8fdc7ff3aba57318b6426
# Parent  8fc0fd715b456754471ea6d0e44bc8a5f963c0de
Adapt indentation to removed for-loop -- no code changes.

diff -r 8fc0fd715b45 -r 27cf2c0c5303 scripts/pkg/pkg.m
--- a/scripts/pkg/pkg.m	Mon Mar 24 21:14:18 2008 +0100
+++ b/scripts/pkg/pkg.m	Mon Mar 24 11:24:14 2008 +0100
@@ -601,41 +601,41 @@ function install (files, handle_deps, au
 	endif
 
 	## the two first entries of dirlist are "." and ".."
-	  packdir = fullfile (tmpdir, dirlist{k});
-	  packdirs{end+1} = packdir;
-
-	  ## Make sure the package contains necessary files
-	  verify_directory (packdir);
-
-	  ## Read the DESCRIPTION file
-	  filename = fullfile (packdir, "DESCRIPTION");
-	  desc = get_description (filename);
-
-	  ## Verify that package name corresponds with filename
-	  [dummy, nm] = fileparts (tgz); 
-	  if ((length (nm) >= length (desc.name))
-	      && ! strcmp (desc.name, nm(1:length(desc.name))))
-	    error ("package name '%s' doesn't correspond to its filename '%s'", 
-		   desc.name, nm);
+	packdir = fullfile (tmpdir, dirlist{k});
+	packdirs{end+1} = packdir;
+	
+	## Make sure the package contains necessary files
+	verify_directory (packdir);
+	
+	## Read the DESCRIPTION file
+	filename = fullfile (packdir, "DESCRIPTION");
+	desc = get_description (filename);
+	
+	## Verify that package name corresponds with filename
+	[dummy, nm] = fileparts (tgz); 
+	if ((length (nm) >= length (desc.name))
+	    && ! strcmp (desc.name, nm(1:length(desc.name))))
+	  error ("package name '%s' doesn't correspond to its filename '%s'", 
+		 desc.name, nm);
+	endif
+	
+	## Set default installation directory
+	desc.dir = fullfile (prefix, cstrcat (desc.name, "-", desc.version));
+	
+	## Set default architectire dependent installation directory
+	desc.archprefix = fullfile (archprefix, cstrcat (desc.name, "-",
+							 desc.version));
+	
+	## Save desc
+	descriptions{end+1} = desc;
+	
+	## Are any of the new packages already installed?
+	## If so we'll remove the old version.
+	for j = 1:length (packages)
+	  if (strcmp (packages{j}.name, desc.name))
+	    packages_to_uninstall(end+1) = j;
 	  endif
-
-	  ## Set default installation directory
-	  desc.dir = fullfile (prefix, cstrcat (desc.name, "-", desc.version));
-
-	  ## Set default architectire dependent installation directory
-	  desc.archprefix = fullfile (archprefix, cstrcat (desc.name, "-",
-							  desc.version));
-
-	  ## Save desc
-	  descriptions{end+1} = desc;
-
-	  ## Are any of the new packages already installed?
-	  ## If so we'll remove the old version.
-	  for j = 1:length (packages)
-	    if (strcmp (packages{j}.name, desc.name))
-	      packages_to_uninstall(end+1) = j;
-	    endif
-	  endfor
+	endfor
       endif
     endfor
   catch
# HG changeset patch
# User Thomas Weber <address@hidden>
# Date 1206390091 -3600
# Node ID a8e360da15d96fdaf3f41285a0c88f764b1be3c2
# Parent  27cf2c0c5303d244aed8fdc7ff3aba57318b6426
Allow installation of already extracted packages
* * *
Changelog entry for installation of already extracted packages

diff -r 27cf2c0c5303 -r a8e360da15d9 scripts/ChangeLog
--- a/scripts/ChangeLog	Mon Mar 24 11:24:14 2008 +0100
+++ b/scripts/ChangeLog	Mon Mar 24 21:21:31 2008 +0100
@@ -1,6 +1,10 @@ 2008-03-24  Thomas Weber  <thomas.weber.
 2008-03-24  Thomas Weber  <address@hidden>
 
-	* pkg/pkg.m: Remove unnecessary for-loop
+	* pkg/pkg.m: Allow installation of already extracted packages.
+
+2008-03-24  Thomas Weber  <address@hidden>
+
+	* pkg/pkg.m: Remove unnecessary for-loop.
 
 2008-03-21  David Bateman  <address@hidden>
 
diff -r 27cf2c0c5303 -r a8e360da15d9 scripts/pkg/pkg.m
--- a/scripts/pkg/pkg.m	Mon Mar 24 11:24:14 2008 +0100
+++ b/scripts/pkg/pkg.m	Mon Mar 24 21:21:31 2008 +0100
@@ -599,9 +599,20 @@ function install (files, handle_deps, au
 	if (length (dirlist) > 3)
 	  error ("bundles of packages are not allowed")
 	endif
+      endif
 
+      ## The filename pointed to an uncompressed package to begin with
+      if (exist (tgz, "dir"))
+	dirlist = {".", "..", tgz};
+      endif
+
+      if (exist (tgz, "file") || exist (tgz, "dir"))
 	## the two first entries of dirlist are "." and ".."
-	packdir = fullfile (tmpdir, dirlist{k});
+	if (exist (tgz, "file"))
+	  packdir = fullfile (tmpdir, dirlist{3});
+	else
+	  packdir = fullfile (pwd(), dirlist{3});
+	endif
 	packdirs{end+1} = packdir;
 	
 	## Make sure the package contains necessary files