Mercurial > hg > octave-lyh
comparison scripts/pkg/private/copy_files.m @ 14471:d2c095e45196
maint: Remove redundant private function from the package manager.
* pkg/private/rm_rf.m: remove file.
* pkg/provate/build.m: remove calls to rm_rf.
* pkg/provate/configure_make.m: remove calls to rm_rf.
* pkg/provate/copy_files.m: remove calls to rm_rf.
* pkg/provate/finish_installation.m: remove calls to rm_rf.
* pkg/provate/install.m: remove calls to rm_rf.
* pkg/provate/packinfo_copy_file.m: remove calls to rm_rf.
* pkg/provate/prepare_installation.m: remove calls to rm_rf.
* pkg/provate/repackage.m: remove calls to rm_rf.
* pkg/provate/uninstall.m: remove calls to rm_rf.
author | Carlo de Falco <kingcrimson@tiscali.it> |
---|---|
date | Fri, 16 Mar 2012 18:55:09 +0100 |
parents | cfb0173fe1ca |
children | a46b8b0bd325 |
comparison
equal
deleted
inserted
replaced
14470:aad7ad0e15c1 | 14471:d2c095e45196 |
---|---|
38 ## Copy the files from "inst" to installdir. | 38 ## Copy the files from "inst" to installdir. |
39 instdir = fullfile (packdir, "inst"); | 39 instdir = fullfile (packdir, "inst"); |
40 if (! dirempty (instdir)) | 40 if (! dirempty (instdir)) |
41 [status, output] = copyfile (fullfile (instdir, "*"), desc.dir); | 41 [status, output] = copyfile (fullfile (instdir, "*"), desc.dir); |
42 if (status != 1) | 42 if (status != 1) |
43 rm_rf (desc.dir); | 43 rmdir (desc.dir, "s"); |
44 error ("couldn't copy files to the installation directory"); | 44 error ("couldn't copy files to the installation directory"); |
45 endif | 45 endif |
46 if (exist (fullfile (desc.dir, getarch ()), "dir") | 46 if (exist (fullfile (desc.dir, getarch ()), "dir") |
47 && ! strcmp (fullfile (desc.dir, getarch ()), octfiledir)) | 47 && ! strcmp (fullfile (desc.dir, getarch ()), octfiledir)) |
48 if (! exist (octfiledir, "dir")) | 48 if (! exist (octfiledir, "dir")) |
53 if (! exist (octm2, "dir")) | 53 if (! exist (octm2, "dir")) |
54 octm3 = fileparts (octm2); | 54 octm3 = fileparts (octm2); |
55 if (! exist (octm3, "dir")) | 55 if (! exist (octm3, "dir")) |
56 [status, output] = mkdir (octm3); | 56 [status, output] = mkdir (octm3); |
57 if (status != 1) | 57 if (status != 1) |
58 rm_rf (desc.dir); | 58 rmdir (desc.dir, "s"); |
59 error ("couldn't create installation directory %s : %s", | 59 error ("couldn't create installation directory %s : %s", |
60 octm3, output); | 60 octm3, output); |
61 endif | 61 endif |
62 endif | 62 endif |
63 [status, output] = mkdir (octm2); | 63 [status, output] = mkdir (octm2); |
64 if (status != 1) | 64 if (status != 1) |
65 rm_rf (desc.dir); | 65 rmdir (desc.dir, "s"); |
66 error ("couldn't create installation directory %s : %s", | 66 error ("couldn't create installation directory %s : %s", |
67 octm2, output); | 67 octm2, output); |
68 endif | 68 endif |
69 endif | 69 endif |
70 [status, output] = mkdir (octm1); | 70 [status, output] = mkdir (octm1); |
71 if (status != 1) | 71 if (status != 1) |
72 rm_rf (desc.dir); | 72 rmdir (desc.dir, "s"); |
73 error ("couldn't create installation directory %s : %s", | 73 error ("couldn't create installation directory %s : %s", |
74 octm1, output); | 74 octm1, output); |
75 endif | 75 endif |
76 endif | 76 endif |
77 [status, output] = mkdir (octfiledir); | 77 [status, output] = mkdir (octfiledir); |
78 if (status != 1) | 78 if (status != 1) |
79 rm_rf (desc.dir); | 79 rmdir (desc.dir, "s"); |
80 error ("couldn't create installation directory %s : %s", | 80 error ("couldn't create installation directory %s : %s", |
81 octfiledir, output); | 81 octfiledir, output); |
82 endif | 82 endif |
83 endif | 83 endif |
84 [status, output] = movefile (fullfile (desc.dir, getarch (), "*"), | 84 [status, output] = movefile (fullfile (desc.dir, getarch (), "*"), |
85 octfiledir); | 85 octfiledir); |
86 rm_rf (fullfile (desc.dir, getarch ())); | 86 rmdir (fullfile (desc.dir, getarch ()), "s"); |
87 | 87 |
88 if (status != 1) | 88 if (status != 1) |
89 rm_rf (desc.dir); | 89 rmdir (desc.dir, "s"); |
90 rm_rf (octfiledir); | 90 rmdir (octfiledir, "s"); |
91 error ("couldn't copy files to the installation directory"); | 91 error ("couldn't copy files to the installation directory"); |
92 endif | 92 endif |
93 endif | 93 endif |
94 | 94 |
95 endif | 95 endif |
96 | 96 |
97 ## Create the "packinfo" directory. | 97 ## Create the "packinfo" directory. |
98 packinfo = fullfile (desc.dir, "packinfo"); | 98 packinfo = fullfile (desc.dir, "packinfo"); |
99 [status, msg] = mkdir (packinfo); | 99 [status, msg] = mkdir (packinfo); |
100 if (status != 1) | 100 if (status != 1) |
101 rm_rf (desc.dir); | 101 rmdir (desc.dir, "s"); |
102 rm_rf (octfiledir); | 102 rmdir (octfiledir, "s"); |
103 error ("couldn't create packinfo directory: %s", msg); | 103 error ("couldn't create packinfo directory: %s", msg); |
104 endif | 104 endif |
105 | 105 |
106 packinfo_copy_file ("DESCRIPTION", "required", packdir, packinfo, desc, octfiledir); | 106 packinfo_copy_file ("DESCRIPTION", "required", packdir, packinfo, desc, octfiledir); |
107 packinfo_copy_file ("COPYING", "required", packdir, packinfo, desc, octfiledir); | 107 packinfo_copy_file ("COPYING", "required", packdir, packinfo, desc, octfiledir); |
117 else | 117 else |
118 try | 118 try |
119 write_index (desc, fullfile (packdir, "inst"), | 119 write_index (desc, fullfile (packdir, "inst"), |
120 fullfile (packinfo, "INDEX"), global_install); | 120 fullfile (packinfo, "INDEX"), global_install); |
121 catch | 121 catch |
122 rm_rf (desc.dir); | 122 rmdir (desc.dir, "s"); |
123 rm_rf (octfiledir); | 123 rmdir (octfiledir, "s"); |
124 rethrow (lasterror ()); | 124 rethrow (lasterror ()); |
125 end_try_catch | 125 end_try_catch |
126 endif | 126 endif |
127 | 127 |
128 ## Is there an 'on_uninstall.m' to install? | 128 ## Is there an 'on_uninstall.m' to install? |