Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Python 3 for MunkiReport v5 #1498

Merged
merged 72 commits into from
Jun 18, 2023
Merged
Changes from 1 commit
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
c77b04c
Merge 5.6.5 (#1407)
bochoven Mar 27, 2021
a04785d
Update third party module repos (#1408)
tuxudo Mar 30, 2021
07d4924
Decode subprocess output
MagerValp Feb 2, 2022
47eccce
Use munki-python for munki postflight script
MagerValp Feb 2, 2022
bff115f
Make munki postflight py3 compatible (#1456)
MagerValp Feb 2, 2022
59cef9d
Remove unused shebangs
MagerValp Feb 2, 2022
966ef10
Merge branch 'main' of github.com:MagerValp/munkireport-php
MagerValp Feb 2, 2022
0ac3af4
Update hashbang to munkireport-python2
MagerValp Feb 2, 2022
47d393f
First pass at py3 compatibility
MagerValp Feb 2, 2022
68521b4
Bytes vs strings fixes
MagerValp Feb 2, 2022
9b83aa4
Fix logic errors
MagerValp Feb 2, 2022
aed390e
Rename await_sym
MagerValp Feb 3, 2022
3ef930f
Merge Python 2/3 work
MagerValp Mar 8, 2022
b45f60b
Merge branch '5.x' into py23
MagerValp Mar 9, 2022
f0bb001
Change hashbang to munkireport-python3
MagerValp Mar 9, 2022
ffb356a
Update CHANGELOG.md
tuxudo Feb 22, 2023
e475e63
5.x-Py3 (#49)
tuxudo Feb 22, 2023
2e792e4
First merge of latest munkilib
tuxudo Feb 22, 2023
74d0f99
Update prefs.py
tuxudo Feb 22, 2023
a1c534a
Update reportcommon.py
tuxudo Feb 22, 2023
eecea01
Update report_broken_client
tuxudo Feb 22, 2023
b383237
Update munkireport-runner
tuxudo Feb 22, 2023
687ac44
Add osutils.py
tuxudo Feb 22, 2023
9728125
Add wrappers.py
tuxudo Feb 22, 2023
c1e144e
Update reportcommon.py
tuxudo Feb 22, 2023
1f84591
Clean up logging
tuxudo Feb 22, 2023
ea5d28b
Add removal of python 2 check
tuxudo Feb 22, 2023
6a619f1
Update install_script.php
tuxudo Feb 22, 2023
832085e
Update composer.json
tuxudo Feb 22, 2023
6bb215f
Update base autopkg recipe
tuxudo Feb 22, 2023
9a77780
Fix uploading of data
tuxudo Feb 23, 2023
6b37e0a
Update reportcommon.py
tuxudo Feb 23, 2023
786ca94
Summary
tuxudo Feb 23, 2023
5787d17
Fixing issue #1496
tuxudo Feb 23, 2023
1c0fc89
Cleanup and fix CPU arch checks
tuxudo Feb 23, 2023
0d0a58b
Update composer
tuxudo Feb 23, 2023
a7dd6f8
Change error to warning on duplicate runs
tuxudo Feb 23, 2023
25713c3
Clean up post install script
tuxudo Feb 23, 2023
878d2ba
Update CHANGELOG.md
tuxudo Feb 23, 2023
7e0b1d4
Update munkireport-runner
tuxudo Feb 23, 2023
970c94a
Update reportcommon.py
tuxudo Feb 23, 2023
c6b0f49
Update MR version
tuxudo Feb 24, 2023
ca491a3
Python 3 support files
tuxudo Feb 27, 2023
1c9efc9
Update reportcommon.py
tuxudo Feb 27, 2023
69a156c
Fix issue reading binary files
tuxudo Feb 27, 2023
b1fcaa5
Fix for installing via script
tuxudo Feb 27, 2023
903198a
Updated munkilib files to 6.2.1
tuxudo Feb 28, 2023
77739ee
Add more config output
tuxudo Feb 28, 2023
943b40a
Update munkireport-runner
tuxudo Feb 28, 2023
fe590ee
Module Marketplace now shows pre-release modules
tuxudo Mar 1, 2023
078d367
Module Marketplace now check module search paths
tuxudo Mar 6, 2023
9f3d0ec
Fix Python 2 remover and uninstallation options
tuxudo Mar 10, 2023
a1a2462
More —show-config results
tuxudo Mar 10, 2023
c4d028e
Update munkireport-runner
tuxudo Mar 10, 2023
db8c791
Update munkireport-runner
tuxudo Mar 10, 2023
6b0fb27
Clean up System Status page
tuxudo Mar 15, 2023
2bdec23
Add `post_max_size` and `upload_max_filesize`
tuxudo Mar 15, 2023
b0b383f
Now detects and mitigates low PHP upload size
tuxudo Mar 16, 2023
3e7a4eb
PHP 8 Compatibility
tuxudo Mar 16, 2023
d51b6b8
Update for PHP 8
tuxudo Mar 16, 2023
db7ae51
Update CHANGELOG.md
tuxudo Mar 16, 2023
4e825da
Update reportcommon.py
tuxudo Mar 16, 2023
aacff4f
Update reportcommon.py
tuxudo Mar 17, 2023
b98316f
Update Dashboard.php
tuxudo Mar 17, 2023
d126a0c
Remove default installed 3rd party modules
tuxudo Mar 17, 2023
91f5eec
PHP 8 compatibility fixes
tuxudo Mar 17, 2023
c923ed4
Update README.md
tuxudo Mar 19, 2023
6b71490
Update munkireport-runner
tuxudo Mar 20, 2023
4d6fd13
Update to use doctrine/dbal
tuxudo Mar 24, 2023
10e5bf2
Update reportcommon.py
tuxudo Mar 27, 2023
51b150b
Update SeedCommand.php
tuxudo Mar 27, 2023
dfb4e5c
Update processor.stub
tuxudo Jun 12, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
More —show-config results
tuxudo committed Mar 10, 2023
commit a1a24625db22c444ecd83aadd43db4cd962268fc
Original file line number Diff line number Diff line change
@@ -22,6 +22,21 @@ import shutil
def get_version():
return reportcommon.pref('Version')

def get_receipt_info():
mr_receipt = FoundationPlist.readPlist("/private/var/db/receipts/com.github.munkireport.plist")

out = {'PackageVersion':'','InstallDate':'','PackageFileName':''}

for receipt_entry in mr_receipt:
if receipt_entry == "PackageVersion":
out["PackageVersion"] = mr_receipt[receipt_entry]
elif receipt_entry == "InstallDate":
out["InstallDate"] = str(mr_receipt[receipt_entry])
elif receipt_entry == "PackageFileName":
out["PackageFileName"] = mr_receipt[receipt_entry]

return out

def main():
'''Main'''

@@ -51,6 +66,8 @@ def main():
if options.version:
print ("MunkiReport-PHP (https://github.com/munkireport/munkireport-php)")
print ("Version: "+get_version())
if os.path.isfile("/private/var/db/receipts/com.github.munkireport.plist"):
print ("PKG version: "+get_receipt_info()["PackageVersion"])
exit(0)

# Check to see if we're root
@@ -60,6 +77,7 @@ def main():

# Print MunkiReport's current config
if options.show_config:
receipt_info = get_receipt_info()
prefs.print_config()
print ('')
if os.path.isfile("/usr/local/munkireport/munkireport-python3"):
@@ -70,6 +88,10 @@ def main():
print (' PyObjC Version: '+objc.__version__)
print ('')
print (' MunkiReport Version: '+get_version())
if os.path.isfile("/private/var/db/receipts/com.github.munkireport.plist"):
print (" MunkiReport PKG Version: "+receipt_info["PackageVersion"])
print (" MunkiReport PKG Name: "+receipt_info["PackageFileName"])
print ("MunkiReport Install Date: "+receipt_info["InstallDate"])
print ('')
print (' Modules enabled: ')
print (reportcommon.pref('ReportItems'))