installinstallmacos.py: Fix bad_dir check, and make warning louder#87
installinstallmacos.py: Fix bad_dir check, and make warning louder#87craig65535 wants to merge 8 commits intomunki:mainfrom
Conversation
craig65535
changed the title
|
@gregneagle Any comments on this one? I can revert the louder warning if you'd like, but I think it's beneficial to have a bad_dir check that works for subdirectories under Downloads/Documents/etc. |
|
@gregneagle Should I close this and merge to a different fork? Please respond |
installinstallmacos.py
Outdated
| print('*** Running this script from %s may not work as expected.' % current_dir, file=sys.stderr) | ||
| print('*** If this does not run as expected, please run again from', file=sys.stderr) | ||
| print('*** somewhere else, such as /Users/Shared.', file=sys.stderr) | ||
| print('*********************************************************', file=sys.stderr) |
There was a problem hiding this comment.
Looks to me like these lines are longer than 80 characters. Please use pylint and make sure the lines are within the current line-lengths.
There was a problem hiding this comment.
@gregneagle Did you want me to wrap at 80, or pylint's default of 100?
There was a problem hiding this comment.
Pretty sure the existing script wraps at 80.
There was a problem hiding this comment.
Why not use the previous code formatting?
print('*********************************************************\n'
'*** Running this script from %s may not work as expected.\n'
'*** If this does not run as expected, please run again from \n'
'*** somewhere else, such as /Users/Shared.\n'
'*********************************************************'
% current_dir, file=sys.stderr)or similar.
There was a problem hiding this comment.
@gregneagle Updated as suggested.
Most of the script wraps at 80, although there is one 85-char line (line 460). I left it alone.
installinstallmacos.py
Outdated
| % current_dir, file=sys.stderr) | ||
| bad_subdirs = ['Documents', 'Desktop', 'Downloads', 'Library'] | ||
| for bad_subdir in bad_subdirs: | ||
| bad_dir = home_dir + os.path.sep + bad_subdir |
There was a problem hiding this comment.
Really should be using os.path.join()
|
@gregneagle All comments addressed for this one. |
2 participants
When reporting #86 I noticed that installinstallmacos.py checks which directory it is being run from, but that check was not working for me. This changes the check so it works with both the "bad" directories like Downloads, and also subdirectories under those directories.