Merge pull request #51 from salopensource/update_version

Bump version

Author: sheagcraig

Makefile

@@ -12,13 +12,14 @@ PAYLOAD=\
 	pack-script-postinstall
 
 clean-build:
-	rm -rf report_broken_client/build
+	@sudo rm -rf report_broken_client/build
 
 pack-report-broken-client: pack-sal-scripts clean-build
 	xcodebuild -project report_broken_client/report_broken_client.xcodeproj -configuration Release
 	@sudo ${CP} report_broken_client/build/Release/report_broken_client ${WORK_D}/usr/local/munki/report_broken_client
 
 pack-sal-scripts: l_usr_local
+	@sudo find . -name '*.pyc' -delete
 	@sudo ${CP} -R payload/ ${WORK_D}
 	@sudo chown -R root:wheel ${WORK_D}
 	@sudo chmod -R 755 ${WORK_D}

payload/usr/local/sal/bin/sal-submit

@@ -99,7 +99,7 @@ def exit_if_not_root():
     if uid != 0:
         sys.exit("Manually running this script requires sudo.")
 
-        
+
 def get_run_type(submission):
     munki = submission.get('Munki', {})
     munki_extras = munki.get('extra_data', {})
@@ -187,6 +187,7 @@ def remove_skipped_facts():
 
 def send_checkin(server_url):
     checkinurl = os.path.join(server_url, 'checkin', '')
+    logging.debug("Sending report to {}".format(checkinurl))
     logging.debug("Checkin Response:")
     out, error = utils.send_report(checkinurl, json_path=utils.RESULTS_PATH)
     log(out, error)

payload/usr/local/sal/checkin_modules/apple_sus_checkin.py

@@ -110,7 +110,7 @@ def get_sus_facts():
 
     for line in reversed(install_log):
         # TODO: Stop if we go before the subprocess call datetime-wise
-        if 'Catalog:' in line and 'catalog' not in result:
+        if 'Catalog: http' in line and 'catalog' not in result:
             result['catalog'] = line.split()[-1]
         elif 'SUScan: Elapsed scan time = ' in line and 'last_check' not in result:
             # Example date 2019-02-08 10:49:56-05

payload/usr/local/sal/utils.py

@@ -22,7 +22,7 @@
 
 BUNDLE_ID = 'com.github.salopensource.sal'
 RESULTS_PATH = '/usr/local/sal/checkin_results.json'
-VERSION = '3.0.0'
+VERSION = '3.0.1'
 
 
 def sal_version():