|
Line
Link Here
|
| 0 |
-- a/scripts/pkg/private/install.m |
0 |
++ b/scripts/pkg/private/install.m |
|
Lines 62-68
Link Here
|
| 62 |
for i = 1:length (files) |
62 |
for i = 1:length (files) |
| 63 |
tgz = files{i}; |
63 |
tgz = files{i}; |
| 64 |
|
64 |
|
| 65 |
if (exist (tgz, "file")) |
65 |
## The filename pointed to an uncompressed package to begin with. |
|
|
66 |
if (exist (tgz, "dir")) |
| 67 |
if (tgz(1) == '/') |
| 68 |
packdir = tgz; |
| 69 |
else |
| 70 |
packdir = fullfile (pwd(), tgz); |
| 71 |
endif |
| 72 |
elseif (exist (tgz, "file")) |
| 66 |
## Create a temporary directory. |
73 |
## Create a temporary directory. |
| 67 |
tmpdir = tempname (); |
74 |
tmpdir = tempname (); |
| 68 |
tmpdirs{end+1} = tmpdir; |
75 |
tmpdirs{end+1} = tmpdir; |
|
Lines 89-108
Link Here
|
| 89 |
if (length (dirlist) > 3) |
96 |
if (length (dirlist) > 3) |
| 90 |
error ("bundles of packages are not allowed"); |
97 |
error ("bundles of packages are not allowed"); |
| 91 |
endif |
98 |
endif |
| 92 |
endif |
|
|
| 93 |
|
99 |
|
| 94 |
## The filename pointed to an uncompressed package to begin with. |
100 |
## The two first entries of dirlist are "." and "..". |
| 95 |
if (isfolder (tgz)) |
101 |
packdir = fullfile (tmpdir, dirlist{3}); |
| 96 |
dirlist = {".", "..", tgz}; |
|
|
| 97 |
endif |
102 |
endif |
| 98 |
|
103 |
|
| 99 |
if (exist (tgz, "file") || isfolder (tgz)) |
104 |
if (exist (tgz, "file") || isfolder (tgz)) |
| 100 |
## The two first entries of dirlist are "." and "..". |
|
|
| 101 |
if (exist (tgz, "file")) |
| 102 |
packdir = fullfile (tmpdir, dirlist{3}); |
| 103 |
else |
| 104 |
packdir = fullfile (pwd (), dirlist{3}); |
| 105 |
endif |
| 106 |
packdirs{end+1} = packdir; |
105 |
packdirs{end+1} = packdir; |
| 107 |
|
106 |
|
| 108 |
## Make sure the package contains necessary files. |
107 |
## Make sure the package contains necessary files. |
