|
36 | 36 | from commoncode import fileutils |
37 | 37 | from commoncode import filetype |
38 | 38 | from commoncode.text import toascii |
39 | | -from commoncode.system import on_macos_14_or_higher |
40 | 39 |
|
41 | 40 | from scancode_config import __version__ |
42 | 41 | from scancode.api import extract_archives |
|
47 | 46 | echo_stderr = partial(click.secho, err=True) |
48 | 47 |
|
49 | 48 |
|
50 | | -def print_macos_warning(quiet=False): |
51 | | - if not quiet and on_macos_14_or_higher: |
52 | | - echo_stderr('!!! WARNING !!!' |
53 | | - 'You are running a version of macOS that is using the APFS ' |
54 | | - 'filesystem. To avoid incorrect and misleading archive extraction ' |
55 | | - 'you should ensure that the disk that contains the files to extract ' |
56 | | - 'has been formatted to be case-sensitive for file names by using the ' |
57 | | - '"APFS (Case-sensitive)" format when creating the filesystem with Diskutil. ' |
58 | | - 'Otherwise it is possible that some archive that contain mixed-case ' |
59 | | - 'names may not be correctly extracted.') |
60 | | - |
61 | | - |
62 | 49 | def print_version(ctx, param, value): |
63 | 50 | if not value or ctx.resilient_parsing: |
64 | 51 | return |
@@ -114,7 +101,6 @@ def extractcode(ctx, input, verbose, quiet, shallow, replace_originals, *args, * |
114 | 101 | Archives found inside an extracted archive are extracted recursively. |
115 | 102 | Extraction is done in-place in a directory named '-extract' side-by-side with an archive. |
116 | 103 | """ |
117 | | - print_macos_warning(quiet) |
118 | 104 |
|
119 | 105 | abs_location = fileutils.as_posixpath(os.path.abspath(os.path.expanduser(input))) |
120 | 106 |
|
@@ -194,7 +180,6 @@ def display_extract_summary(): |
194 | 180 | has_extract_errors = has_extract_errors or xev.errors |
195 | 181 |
|
196 | 182 | rc = 1 if has_extract_errors else 0 |
197 | | - print_macos_warning(quiet) |
198 | 183 | ctx.exit(rc) |
199 | 184 |
|
200 | 185 |
|
|
0 commit comments