mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-01-06 06:29:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

Various typo fixes and spelling corrections (#907)

Browse Source 
* Fixed "No Comment" typo in strings files

* Fix "problem updates" typo

* Fix "caught" typo

* Fix "pseudo" typo

* Fix "instantiated" typo

* Fix "explicitly" typo

* Fix "osascript" typo

* Spelling fixes and various other corrections

* Fix two more instances of "Logput"

* Fixed a few remaining spelling issues in python files

* Fix "because" typo

PR also submitted upstream to the Murky project for the same correction.

* Fix name of associated app

* Additional spelling corrections in comments/docstrings
This commit is contained in:
Elliot Jordan
2019-02-14 08:30:43 -08:00
committed by Greg Neagle
parent 435719eb3c
commit d14c4304ea
91 changed files with 134 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/ISSUE_TEMPLATE.md vendored
View File

@@ -4,5 +4,5 @@ https://github.com/munki/munki#get-help
https://github.com/munki/munki/wiki#where-to-go-for-more-info-and-help
https://github.com/munki/munki/wiki/Troubleshooting#still-stuck
Please use the code issues section for reporting reproducable issues with the code or to propose/request new features.
Please use the code issues section for reporting reproducible issues with the code or to propose/request new features.
But before you do, consider bringing up the topic for discussion on the munki-dev list: http://groups.google.com/group/munki-dev

2
code/apps/Managed Software Center/Managed Software Center.xcodeproj/project.pbxproj
View File

@@ -406,7 +406,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# add this number to Git revision index to get \"build\" number consistent with old SVN repo\nMAGICNUMBER=482\n\nBASEVERNUM=`/usr/libexec/PlistBuddy -c \"Print :CFBundleShortVersionString\" \"${INFOPLIST_FILE}\"`\n\nGIT=`which git`\n\nif [ \"$GIT\" != \"\" ] ; then\n# generate a psuedo-svn revision number from the list of Git revisions\nGITREV=`$GIT log -n1 --format=\"%H\" -- ./`\nGITREVINDEX=`$GIT rev-list --count $GITREV`\nREV=$(($GITREVINDEX + $MAGICNUMBER))\n\n/usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString $BASEVERNUM.$REV\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $REV\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n/usr/libexec/PlistBuddy -c \"Set :GitRevision string $GITREV\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\nfi";
shellScript = "# add this number to Git revision index to get \"build\" number consistent with old SVN repo\nMAGICNUMBER=482\n\nBASEVERNUM=`/usr/libexec/PlistBuddy -c \"Print :CFBundleShortVersionString\" \"${INFOPLIST_FILE}\"`\n\nGIT=`which git`\n\nif [ \"$GIT\" != \"\" ] ; then\n# generate a pseudo-svn revision number from the list of Git revisions\nGITREV=`$GIT log -n1 --format=\"%H\" -- ./`\nGITREVINDEX=`$GIT rev-list --count $GITREV`\nREV=$(($GITREVINDEX + $MAGICNUMBER))\n\n/usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString $BASEVERNUM.$REV\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $REV\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n/usr/libexec/PlistBuddy -c \"Set :GitRevision string $GITREV\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\nfi";
};
/* End PBXShellScriptBuildPhase section */

BIN
code/apps/Managed Software Center/Managed Software Center/Base.lproj/Localizable.strings
View File

Binary file not shown.

2
code/apps/Managed Software Center/Managed Software Center/Controllers/MSCAlertController.swift
View File

@@ -161,7 +161,7 @@ class MSCAlertController: NSObject {
} else if updatesRequireLogout() || installRequiresLogout() {
let alert = NSAlert()
alert.messageText = NSLocalizedString(
"Logout Required", comment: "Logput Required title")
"Logout Required", comment: "Logout Required title")
alert.informativeText = NSLocalizedString(
"A logout is required before updating. Please be patient " +
"as there may be a short delay at the login window. Log " +

2
code/apps/Managed Software Center/Managed Software Center/Controllers/MSCPasswordAlertController.swift
View File

@@ -40,7 +40,7 @@ class MSCPasswordAlertController: NSObject {
fieldFrame.origin.x = labelWidth + 8
fieldFrame.size.width = viewWidth - labelWidth - 8
passwordField.frame = fieldFrame
// add esc as a key equivilent for the Deny button
// add esc as a key equivalent for the Deny button
alert.buttons[1].keyEquivalent = "\u{1B}"
// change the Allow button to call our password validation method
let allowButton = alert.buttons[0]

4
code/apps/Managed Software Center/Managed Software Center/Controllers/MSCStatusController.swift
View File

@@ -105,7 +105,7 @@ class MSCStatusController: NSObject {
}
func sessionEnded(_ result: Int) {
// clean up after a managesoftwareupdate session ends
// clean up after a managedsoftwareupdate session ends
if let uTimer = timer {
uTimer.invalidate()
timer = nil
@@ -297,7 +297,7 @@ class MSCStatusController: NSObject {
}
func getRestartAlertDismissed() -> Bool {
// Was the restart alert dimissed?'
// Was the restart alert dismissed?'
return _status_restartAlertDismissed
}

6
code/apps/Managed Software Center/Managed Software Center/Controllers/MainWindowController.swift
View File

@@ -409,7 +409,7 @@ class MainWindowController: NSWindowController, NSWindowDelegate, WKNavigationDe
}
override func awakeFromNib() {
// Stuff we need to intialize when we start
// Stuff we need to initialize when we start
super.awakeFromNib()
insertWebView()
webView.navigationDelegate = self
@@ -679,7 +679,7 @@ class MainWindowController: NSWindowController, NSWindowDelegate, WKNavigationDe
}
func updateCategoriesPage() {
// Update the Catagories page with current data.
// Update the Categories page with current data.
// Modifies the DOM to avoid ugly browser refresh
let items_html = buildCategoryItemsHTML()
setInnerHTML(items_html, elementID: "optional_installs_items")
@@ -1048,7 +1048,7 @@ class MainWindowController: NSWindowController, NSWindowDelegate, WKNavigationDe
func actionButtonClicked(_ item_name: String) {
// this method is called from JavaScript when the user clicks
// the Install/Removel/Cancel button in the list or detail view
// the Install/Remove/Cancel button in the list or detail view
if let item = optionalItem(forName: item_name) {
var showAlert = true
let status = item["status"] as? String ?? ""

4
code/apps/Managed Software Center/Managed Software Center/MunkiItems.swift
View File

@@ -45,7 +45,7 @@ func unquote(_ aString: String) -> String {
}
func clearMunkiItemsCache() {
// formely known as reset()
// formerly known as reset()
Cache.shared.clear()
}
@@ -246,7 +246,7 @@ class GenericItem: BaseItem {
func unavailable_reason_text(is_update: Bool = false) -> String {
// There are several reasons an item might be unavailable for install.
// Return the relevent reason
// Return the relevant reason
let licensed_seats_available = my["licensed_seats_available"] as? Bool ?? true
if !licensed_seats_available {
return NSLocalizedString("No licenses available",

2
code/apps/Managed Software Center/Managed Software Center/Resources/WebResources/integration.js
View File

@@ -1,4 +1,4 @@
/* appearance.js
/* integration.js
Managed Software Center
Created by Greg Neagle on 8/27/18.

2
code/apps/Managed Software Center/Managed Software Center/Socket.swift
View File

@@ -1,5 +1,5 @@
//
// UnixDomainSocket.swift
// Socket.swift
// Managed Software Center
//
// Created by Greg Neagle on 7/23/18.

10
code/apps/Managed Software Center/Managed Software Center/authrestart.swift
View File

@@ -114,7 +114,7 @@ func fvIsActive() -> Bool {
do {
return try AuthRestartClient().fvIsActive()
} catch {
msc_debug_log("fvIsActive(): Cought \(error)")
msc_debug_log("fvIsActive(): Caught \(error)")
return false
}
}
@@ -125,7 +125,7 @@ func verifyUser(_ username: String) -> Bool {
do {
return try AuthRestartClient().verifyUser(username)
} catch {
msc_debug_log("verifyUser(): Cought \(error)")
msc_debug_log("verifyUser(): Caught \(error)")
return false
}
}
@@ -136,7 +136,7 @@ func verifyRecoveryKeyPresent() -> Bool {
do {
return try AuthRestartClient().verifyRecoveryKeyPresent()
} catch {
msc_debug_log("verifyRecoveryKeyPresent(): Cought \(error)")
msc_debug_log("verifyRecoveryKeyPresent(): Caught \(error)")
return false
}
}
@@ -146,7 +146,7 @@ func verifyCanAttemptAuthRestart() -> Bool {
do {
return try AuthRestartClient().verifyCanAttemptAuthRestart()
} catch {
msc_debug_log("verifyCanAttemptAuthRestart(): Cought \(error)")
msc_debug_log("verifyCanAttemptAuthRestart(): Caught \(error)")
return false
}
}
@@ -158,7 +158,7 @@ func storePassword(_ password: String, forUserName username: String = "") -> Boo
try AuthRestartClient().storePassword(password, username: username)
return true
} catch {
msc_debug_log("storePassword(): Cought \(error)")
msc_debug_log("storePassword(): Caught \(error)")
return false
}
}

2
code/apps/Managed Software Center/Managed Software Center/da.lproj/Localizable.strings
View File

@@ -274,7 +274,7 @@
/* Preparing Removal status text */
"Preparing removal" = "Forbereder fjernelse";
/* Problm Updates label */
/* Problem Updates label */
"Problem updates" = "Problematiske opdateringer";
/* Quit button title */

2
code/apps/Managed Software Center/Managed Software Center/de.lproj/Localizable.strings
View File

@@ -274,7 +274,7 @@
/* Preparing Removal status text */
"Preparing removal" = "Bereite das Entfernen vor";
/* Problm Updates label */
/* Problem Updates label */
"Problem updates" = "Problematische updates";
/* Quit button title */

BIN
code/apps/Managed Software Center/Managed Software Center/en.lproj/Localizable.strings
View File

Binary file not shown.

2
code/apps/Managed Software Center/Managed Software Center/es.lproj/Localizable.strings
View File

@@ -274,7 +274,7 @@
/* Preparing Removal status text */
"Preparing removal" = "Preparando desinstalación";
/* Problm Updates label */
/* Problem Updates label */
"Problem updates" = "Actualización problematica";
/* Quit button title */

2
code/apps/Managed Software Center/Managed Software Center/fi.lproj/Localizable.strings
View File

@@ -274,7 +274,7 @@
/* Preparing Removal status text */
"Preparing removal" = "Valmistellaan poistoa";
/* Problm Updates label */
/* Problem Updates label */
"Problem updates" = "Epäonnistuneet päivitykset";
/* Quit button title */

2
code/apps/Managed Software Center/Managed Software Center/fr.lproj/Localizable.strings
View File

@@ -275,7 +275,7 @@
/* Preparing Removal status text */
"Preparing removal" = "Préparation de la suppression";
/* Problm Updates label */
/* Problem Updates label */
"Problem updates" = "Mises à jour problématiques";
/* Quit button title */

2
code/apps/Managed Software Center/Managed Software Center/it.lproj/Localizable.strings
View File

@@ -274,7 +274,7 @@
/* Preparing Removal status text */
"Preparing removal" = "Rimozione in preparazione";
/* Problm Updates label */
/* Problem Updates label */
"Problem updates" = "Aggiornamenti che richiedono attenzione";
/* Quit button title */

2
code/apps/Managed Software Center/Managed Software Center/ja.lproj/Localizable.strings
View File

@@ -274,7 +274,7 @@
/* Preparing Removal status text */
"Preparing removal" = "削除準備中です";
/* Problm Updates label */
/* Problem Updates label */
"Problem updates" = "問題のアップデート";
/* Quit button title */

6
code/apps/Managed Software Center/Managed Software Center/mschtml.swift
View File

@@ -55,7 +55,7 @@ func getRawTemplate(_ template_name: String) -> String {
}
func getTemplate(_ template_name: String) -> Template {
// return a Template object containg our html template
// return a Template object containing our html template
return Template(getRawTemplate(template_name))
}
@@ -623,7 +623,7 @@ func buildUpdatesPage() throws {
{ ($0["status"] as? String ?? "") == "update-available" }
)
// find any listed optional install updates that require a higher OS
// or have insufficent disk space or other blockers (because they have a
// or have insufficient disk space or other blockers (because they have a
// note)
let blocked_optional_updates = getOptionalInstallItems().filter(
{
@@ -676,7 +676,7 @@ func buildUpdatesPage() throws {
// build problem updates table
page["problem_updates_header_message"] = NSLocalizedString(
"Problem updates", comment: "Problm Updates label")
"Problem updates", comment: "Problem Updates label")
page["problem_update_rows"] = ""
if !problem_updates.isEmpty {
page["hide_problem_updates"] = ""

2
code/apps/Managed Software Center/Managed Software Center/munki.swift
View File

@@ -352,7 +352,7 @@ func startUpdateCheck(_ suppress_apple_update_check: Bool = false) throws {
}
func logoutNow() {
/* Uses oscascript to run an AppleScript
/* Uses osascript to run an AppleScript
to tell loginwindow to logout.
Ugly, but it works. */
let script = """

2
code/apps/Managed Software Center/Managed Software Center/nb.lproj/Localizable.strings
View File

@@ -274,7 +274,7 @@
/* Preparing Removal status text */
"Preparing removal" = "Forbereder avinstallasjon";
/* Problm Updates label */
/* Problem Updates label */
"Problem updates" = "Problematiske oppdateringer";
/* Quit button title */

2
code/apps/Managed Software Center/Managed Software Center/nl.lproj/Localizable.strings
View File

@@ -274,7 +274,7 @@
/* Preparing Removal status text */
"Preparing removal" = "Verwijderen voorbereiden";
/* Problm Updates label */
/* Problem Updates label */
"Problem updates" = "Problematische updates";
/* Quit button title */

2
code/apps/Managed Software Center/Managed Software Center/ru.lproj/Localizable.strings
View File

@@ -274,7 +274,7 @@
/* Preparing Removal status text */
"Preparing removal" = "Подготовка удаления";
/* Problm Updates label */
/* Problem Updates label */
"Problem updates" = "проблемные обновления";
/* Quit button title */

2
code/apps/Managed Software Center/Managed Software Center/sv.lproj/Localizable.strings
View File

@@ -274,7 +274,7 @@
/* Preparing Removal status text */
"Preparing removal" = "Förbereder borttagning";
/* Problm Updates label */
/* Problem Updates label */
"Problem updates" = "Problem updates";
/* Quit button title */

2
code/apps/MunkiStatus/MunkiStatus.xcodeproj/project.pbxproj
View File

@@ -219,7 +219,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# add this number to Git revision index to get \"build\" number consistent with old SVN repo\nMAGICNUMBER=482\n\nBASEVERNUM=`/usr/libexec/PlistBuddy -c \"Print :CFBundleShortVersionString\" \"${INFOPLIST_FILE}\"`\n\nGIT=`which git`\n\nif [ \"$GIT\" != \"\" ] ; then\n# generate a psuedo-svn revision number from the list of Git revisions\nGITREV=`$GIT log -n1 --format=\"%H\" -- ./`\nGITREVINDEX=`$GIT rev-list --count $GITREV`\nREV=$(($GITREVINDEX + $MAGICNUMBER))\n\n/usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString $BASEVERNUM.$REV\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $REV\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n/usr/libexec/PlistBuddy -c \"Set :GitRevision string $GITREV\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\nfi";
shellScript = "# add this number to Git revision index to get \"build\" number consistent with old SVN repo\nMAGICNUMBER=482\n\nBASEVERNUM=`/usr/libexec/PlistBuddy -c \"Print :CFBundleShortVersionString\" \"${INFOPLIST_FILE}\"`\n\nGIT=`which git`\n\nif [ \"$GIT\" != \"\" ] ; then\n# generate a pseudo-svn revision number from the list of Git revisions\nGITREV=`$GIT log -n1 --format=\"%H\" -- ./`\nGITREVINDEX=`$GIT rev-list --count $GITREV`\nREV=$(($GITREVINDEX + $MAGICNUMBER))\n\n/usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString $BASEVERNUM.$REV\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $REV\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n/usr/libexec/PlistBuddy -c \"Set :GitRevision string $GITREV\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\nfi";
};
/* End PBXShellScriptBuildPhase section */

2
code/apps/munki-notifier/munki-notifier.xcodeproj/project.pbxproj
View File

@@ -219,7 +219,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# add this number to Git revision index to get \"build\" number consistent with old SVN repo\nMAGICNUMBER=482\n\nBASEVERNUM=`/usr/libexec/PlistBuddy -c \"Print :CFBundleShortVersionString\" \"${INFOPLIST_FILE}\"`\n\nGIT=`which git`\n\nif [ \"$GIT\" != \"\" ] ; then\n# generate a psuedo-svn revision number from the list of Git revisions\nGITREV=`$GIT log -n1 --format=\"%H\" -- ./`\nGITREVINDEX=`$GIT rev-list --count $GITREV`\nREV=$(($GITREVINDEX + $MAGICNUMBER))\n\n/usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString $BASEVERNUM.$REV\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $REV\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n/usr/libexec/PlistBuddy -c \"Set :GitRevision string $GITREV\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\nfi";
shellScript = "# add this number to Git revision index to get \"build\" number consistent with old SVN repo\nMAGICNUMBER=482\n\nBASEVERNUM=`/usr/libexec/PlistBuddy -c \"Print :CFBundleShortVersionString\" \"${INFOPLIST_FILE}\"`\n\nGIT=`which git`\n\nif [ \"$GIT\" != \"\" ] ; then\n# generate a pseudo-svn revision number from the list of Git revisions\nGITREV=`$GIT log -n1 --format=\"%H\" -- ./`\nGITREVINDEX=`$GIT rev-list --count $GITREV`\nREV=$(($GITREVINDEX + $MAGICNUMBER))\n\n/usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString $BASEVERNUM.$REV\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $REV\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n/usr/libexec/PlistBuddy -c \"Set :GitRevision string $GITREV\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\nfi";
};
/* End PBXShellScriptBuildPhase section */

2
code/apps/munki-notifier/munki-notifier/da.lproj/InfoPlist.strings
View File

@@ -1,3 +1,3 @@
/* (No Commment) */
/* (No Comment) */
"NSHumanReadableCopyright" = "Copyright © 2019 The Munki Project. All rights reserved.";

2
code/apps/munki-notifier/munki-notifier/de.lproj/InfoPlist.strings
View File

@@ -1,3 +1,3 @@
/* (No Commment) */
/* (No Comment) */
"NSHumanReadableCopyright" = "Copyright © 2019 The Munki Project. All rights reserved.";

2
code/apps/munki-notifier/munki-notifier/en.lproj/InfoPlist.strings
View File

@@ -1,3 +1,3 @@
/* (No Commment) */
/* (No Comment) */
"NSHumanReadableCopyright" = "Copyright © 2019 The Munki Project. All rights reserved.";

2
code/apps/munki-notifier/munki-notifier/es.lproj/InfoPlist.strings
View File

@@ -1,3 +1,3 @@
/* (No Commment) */
/* (No Comment) */
"NSHumanReadableCopyright" = "Copyright © 2019 The Munki Project. All rights reserved.";

2
code/apps/munki-notifier/munki-notifier/fi.lproj/InfoPlist.strings
View File

@@ -1,3 +1,3 @@
/* (No Commment) */
/* (No Comment) */
"NSHumanReadableCopyright" = "Copyright © 2019 The Munki Project. All rights reserved.";

2
code/apps/munki-notifier/munki-notifier/fr.lproj/InfoPlist.strings
View File

@@ -1,3 +1,3 @@
/* (No Commment) */
/* (No Comment) */
"NSHumanReadableCopyright" = "Copyright © 2019 The Munki Project. All rights reserved.";

2
code/apps/munki-notifier/munki-notifier/it.lproj/InfoPlist.strings
View File

@@ -1,3 +1,3 @@
/* (No Commment) */
/* (No Comment) */
"NSHumanReadableCopyright" = "Copyright © 2019 The Munki Project. All rights reserved.";

2
code/apps/munki-notifier/munki-notifier/ja.lproj/InfoPlist.strings
View File

@@ -1,3 +1,3 @@
/* (No Commment) */
/* (No Comment) */
"NSHumanReadableCopyright" = "Copyright © 2019 The Munki Project. All rights reserved.";

2
code/apps/munki-notifier/munki-notifier/nb.lproj/InfoPlist.strings
View File

@@ -1,3 +1,3 @@
/* (No Commment) */
/* (No Comment) */
"NSHumanReadableCopyright" = "Copyright © 2019 The Munki Project. All rights reserved.";

2
code/apps/munki-notifier/munki-notifier/nl.lproj/InfoPlist.strings
View File

@@ -1,3 +1,3 @@
/* (No Commment) */
/* (No Comment) */
"NSHumanReadableCopyright" = "Copyright © 2019 The Munki Project. All rights reserved.";

2
code/apps/munki-notifier/munki-notifier/ru.lproj/InfoPlist.strings
View File

@@ -1,3 +1,3 @@
/* (No Commment) */
/* (No Comment) */
"NSHumanReadableCopyright" = "Copyright © 2019 The Munki Project. All rights reserved.";

2
code/apps/munki-notifier/munki-notifier/sv.lproj/InfoPlist.strings
View File

@@ -1,3 +1,3 @@
/* (No Commment) */
/* (No Comment) */
"NSHumanReadableCopyright" = "Copyright © 2019 The Munki Project. All rights reserved.";

2
code/apps/pyobjc/Managed Software Center/Managed Software Center.xcodeproj/project.pbxproj
View File

@@ -494,7 +494,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
shellScript = "# add this number to Git revision index to get \"build\" number consistent with old SVN repo\nMAGICNUMBER=482\n\nBASEVERNUM=`/usr/libexec/PlistBuddy -c \"Print :CFBundleShortVersionString\" \"${INFOPLIST_FILE}\"`\n\n# Git isn't installed on 10.6 or earlier by default, so find it\nGIT=`which git`\nif [ \"$GIT\" == \"\" ] ; then\n # let's hope it's in /usr/local/bin\n if [ -x \"/usr/local/bin/git\" ] ; then\n GIT=/usr/local/bin/git\n fi\nfi\n\nif [ \"$GIT\" != \"\" ] ; then\n # generate a psuedo-svn revision number from the list of Git revisions\n GITREV=`$GIT log -n1 --format=\"%H\" -- ./`\n GITREVINDEX=`$GIT rev-list --count $GITREV`\n REV=$(($GITREVINDEX + $MAGICNUMBER))\n\n /usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString $BASEVERNUM.$REV\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n /usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $REV\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n /usr/libexec/PlistBuddy -c \"Set :GitRevision string $GITREV\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\nfi";
shellScript = "# add this number to Git revision index to get \"build\" number consistent with old SVN repo\nMAGICNUMBER=482\n\nBASEVERNUM=`/usr/libexec/PlistBuddy -c \"Print :CFBundleShortVersionString\" \"${INFOPLIST_FILE}\"`\n\n# Git isn't installed on 10.6 or earlier by default, so find it\nGIT=`which git`\nif [ \"$GIT\" == \"\" ] ; then\n # let's hope it's in /usr/local/bin\n if [ -x \"/usr/local/bin/git\" ] ; then\n GIT=/usr/local/bin/git\n fi\nfi\n\nif [ \"$GIT\" != \"\" ] ; then\n # generate a pseudo-svn revision number from the list of Git revisions\n GITREV=`$GIT log -n1 --format=\"%H\" -- ./`\n GITREVINDEX=`$GIT rev-list --count $GITREV`\n REV=$(($GITREVINDEX + $MAGICNUMBER))\n\n /usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString $BASEVERNUM.$REV\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n /usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $REV\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n /usr/libexec/PlistBuddy -c \"Set :GitRevision string $GITREV\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\nfi";
};
/* End PBXShellScriptBuildPhase section */

2
code/apps/pyobjc/Managed Software Center/Managed Software Center/CocoaWrapper.py
View File

@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
#
# CocoaWrapper.py
# MunkiStatus
# Managed Software Center
#
# Created by Greg Neagle on 6/26/17.
# Copyright (c) 2018-2019 The Munki Project. All rights reserved.

4
code/apps/pyobjc/Managed Software Center/Managed Software Center/Localize.py
View File

@@ -71,8 +71,8 @@ class LocalizationError(Exception):
def detectEncoding(filepath):
'''
Try to detect the file's encoding.
If its not utf-16 assume it's utf-8, this should work for ascii
files becuase the first 128 characters are the same...
If it's not utf-16 assume it's utf-8, this should work for ascii
files because the first 128 characters are the same...
'''
f = open(filepath, 'r')

8
code/apps/pyobjc/Managed Software Center/Managed Software Center/MSCMainWindowController.py
View File

@@ -355,7 +355,7 @@ class MSCMainWindowController(NSWindowController):
self.fullScreenMenuItem.setEnabled_(True)
def awakeFromNib(self):
'''Stuff we need to intialize when we start'''
'''Stuff we need to initialize when we start'''
self.configureFullScreenMenuItem()
self.webView.setDrawsBackground_(NO)
self.webView.setUIDelegate_(self)
@@ -601,7 +601,7 @@ class MSCMainWindowController(NSWindowController):
table_body_element.setInnerHTML_(myitems_rows)
def updateCategoriesPage(self):
'''Update the Catagories page with current data.
'''Update the Categories page with current data.
Modifies the DOM to avoid ugly browser refresh'''
items_html = mschtml.build_category_items_html()
document = self.webView.mainFrameDocument()
@@ -994,7 +994,7 @@ class MSCMainWindowController(NSWindowController):
self.myItemsActionButtonPerformAction_(item_name)
def myItemsActionButtonPerformAction_(self, item_name):
'''perfrom action needed when user clicks
'''perform action needed when user clicks
the Install/Remove/Cancel button in the My Items view'''
document = self.webView.mainFrameDocument()
item = MunkiItems.optionalItemForName_(item_name)
@@ -1066,7 +1066,7 @@ class MSCMainWindowController(NSWindowController):
def actionButtonClicked_(self, item_name):
'''this method is called from JavaScript when the user clicks
the Install/Removel/Cancel button in the list or detail view'''
the Install/Remove/Cancel button in the list or detail view'''
item = MunkiItems.optionalItemForName_(item_name)
if not item:

2
code/apps/pyobjc/Managed Software Center/Managed Software Center/MSCPasswordAlertController.py
View File

@@ -66,7 +66,7 @@ class MSCPasswordAlertController(NSObject):
fieldFrame.origin.x = labelWidth + 8
fieldFrame.size.width = viewWidth - labelWidth - 8
self.passwordField.setFrame_(fieldFrame)
# add esc as a key equivilent for the Deny button
# add esc as a key equivalent for the Deny button
alert.buttons().objectAtIndex_(1).setKeyEquivalent_(chr(27))
# change the Allow button to call our password validation method
allowButton = alert.buttons().objectAtIndex_(0)

8
code/apps/pyobjc/Managed Software Center/Managed Software Center/MSCStatusController.py
View File

@@ -112,7 +112,7 @@ class MSCStatusController(NSObject):
return self.session_started
def sessionEnded_(self, result):
'''clean up after a managesoftwareupdate session ends'''
'''clean up after a managedsoftwareupdate session ends'''
if self.timer:
self.timer.invalidate()
self.timer = None
@@ -126,7 +126,7 @@ class MSCStatusController(NSObject):
self.got_status_update = True
info = notification.userInfo()
msclog.debug_log('%s' % info)
# explictly get keys from info object; PyObjC in Mountain Lion
# explicitly get keys from info object; PyObjC in Mountain Lion
# seems to need this
info_keys = info.keys()
if 'message' in info_keys:
@@ -185,7 +185,7 @@ class MSCStatusController(NSObject):
self._status_percent = -1
def setPercentageDone_(self, percent):
'''Display precentage done'''
'''Display percentage done'''
try:
if float(percent) > 100.0:
percent = 100
@@ -338,7 +338,7 @@ class MSCStatusController(NSObject):
install_btn.setClassName_(' '.join(btn_classes))
def getRestartAlertDismissed(self):
'''Was the restart alert dimissed?'''
'''Was the restart alert dismissed?'''
return self._status_restartAlertDismissed

6
code/apps/pyobjc/Managed Software Center/Managed Software Center/MunkiItems.py
View File

@@ -216,8 +216,8 @@ def updatesContainNonUserSelectedItems():
def getEffectiveUpdateList():
'''Combine the updates Munki has found with any optional choices to
make the effective list of updates'''
# get pending optional items seperately since OptionalItems have
# extra details/attribbutes
# get pending optional items separately since OptionalItems have
# extra details/attributes
optional_installs = getOptionalWillBeInstalledItems()
optional_removals = getOptionalWillBeRemovedItems()
optional_item_names = [item['name']
@@ -693,7 +693,7 @@ class GenericItem(dict):
def unavailable_reason_text(self, is_update=False):
'''There are several reasons an item might be unavailable for install.
Return the relevent reason'''
Return the relevant reason'''
if ('licensed_seats_available' in self
and not self['licensed_seats_available']):
return NSLocalizedString(u"No licenses available",

2
code/apps/pyobjc/Managed Software Center/Managed Software Center/da.lproj/Localizable.strings
View File

@@ -274,7 +274,7 @@
/* Preparing Removal status text */
"Preparing removal" = "Forbereder fjernelse";
/* Problm Updates label */
/* Problem Updates label */
"Problem updates" = "Problematiske opdateringer";
/* Quit button title */

2
code/apps/pyobjc/Managed Software Center/Managed Software Center/de.lproj/Localizable.strings
View File

@@ -274,7 +274,7 @@
/* Preparing Removal status text */
"Preparing removal" = "Bereite das Entfernen vor";
/* Problm Updates label */
/* Problem Updates label */
"Problem updates" = "Problematische updates";
/* Quit button title */

2
code/apps/pyobjc/Managed Software Center/Managed Software Center/es.lproj/Localizable.strings
View File

@@ -274,7 +274,7 @@
/* Preparing Removal status text */
"Preparing removal" = "Preparando desinstalación";
/* Problm Updates label */
/* Problem Updates label */
"Problem updates" = "Actualización problematica";
/* Quit button title */

2
code/apps/pyobjc/Managed Software Center/Managed Software Center/fi.lproj/Localizable.strings
View File

@@ -274,7 +274,7 @@
/* Preparing Removal status text */
"Preparing removal" = "Valmistellaan poistoa";
/* Problm Updates label */
/* Problem Updates label */
"Problem updates" = "Epäonnistuneet päivitykset";
/* Quit button title */

2
code/apps/pyobjc/Managed Software Center/Managed Software Center/fr.lproj/Localizable.strings
View File

@@ -275,7 +275,7 @@
/* Preparing Removal status text */
"Preparing removal" = "Préparation de la suppression";
/* Problm Updates label */
/* Problem Updates label */
"Problem updates" = "Mises à jour problématiques";
/* Quit button title */

2
code/apps/pyobjc/Managed Software Center/Managed Software Center/it.lproj/Localizable.strings
View File

@@ -274,7 +274,7 @@
/* Preparing Removal status text */
"Preparing removal" = "Rimozione in preparazione";
/* Problm Updates label */
/* Problem Updates label */
"Problem updates" = "Aggiornamenti che richiedono attenzione";
/* Quit button title */

2
code/apps/pyobjc/Managed Software Center/Managed Software Center/ja.lproj/Localizable.strings
View File

@@ -274,7 +274,7 @@
/* Preparing Removal status text */
"Preparing removal" = "削除準備中です";
/* Problm Updates label */
/* Problem Updates label */
"Problem updates" = "問題のアップデート";
/* Quit button title */

4
code/apps/pyobjc/Managed Software Center/Managed Software Center/mschtml.py
View File

@@ -555,7 +555,7 @@ def build_updates_page():
if item['status'] == 'update-available']
# find any listed optional install updates that require a higher OS
# or have insufficent disk space or other blockers (because they have a
# or have insufficient disk space or other blockers (because they have a
# note)
blocked_optional_updates = [
item for item in MunkiItems.getOptionalInstallItems()
@@ -599,7 +599,7 @@ def build_updates_page():
# build problem updates table
page['problem_updates_header_message'] = NSLocalizedString(
u"Problem updates",
u"Problm Updates label")
u"Problem Updates label")
page['problem_update_rows'] = u''
if problem_updates:

2
code/apps/pyobjc/Managed Software Center/Managed Software Center/munki.py
View File

@@ -397,7 +397,7 @@ def startUpdateCheck(suppress_apple_update_check=False):
def logoutNow():
'''Uses oscascript to run an AppleScript
'''Uses osascript to run an AppleScript
to tell loginwindow to logout.
Ugly, but it works.'''

2
code/apps/pyobjc/Managed Software Center/Managed Software Center/nb.lproj/Localizable.strings
View File

@@ -274,7 +274,7 @@
/* Preparing Removal status text */
"Preparing removal" = "Forbereder avinstallasjon";
/* Problm Updates label */
/* Problem Updates label */
"Problem updates" = "Problematiske oppdateringer";
/* Quit button title */

2
code/apps/pyobjc/Managed Software Center/Managed Software Center/nl.lproj/Localizable.strings
View File

@@ -274,7 +274,7 @@
/* Preparing Removal status text */
"Preparing removal" = "Verwijderen voorbereiden";
/* Problm Updates label */
/* Problem Updates label */
"Problem updates" = "Problematische updates";
/* Quit button title */

2
code/apps/pyobjc/Managed Software Center/Managed Software Center/ru.lproj/Localizable.strings
View File

@@ -274,7 +274,7 @@
/* Preparing Removal status text */
"Preparing removal" = "Подготовка удаления";
/* Problm Updates label */
/* Problem Updates label */
"Problem updates" = "проблемные обновления";
/* Quit button title */

2
code/apps/pyobjc/Managed Software Center/Managed Software Center/sv.lproj/Localizable.strings
View File

@@ -274,7 +274,7 @@
/* Preparing Removal status text */
"Preparing removal" = "Förbereder borttagning";
/* Problm Updates label */
/* Problem Updates label */
"Problem updates" = "Problem updates";
/* Quit button title */

2
code/apps/pyobjc/MunkiStatus/MunkiStatus.xcodeproj/project.pbxproj
View File

@@ -338,7 +338,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
shellScript = "# add this number to Git revision index to get \"build\" number consistent with old SVN repo\nMAGICNUMBER=482\n\nBASEVERNUM=`/usr/libexec/PlistBuddy -c \"Print :CFBundleShortVersionString\" \"${INFOPLIST_FILE}\"`\n\n# Git isn't installed on 10.6 or earlier by default, so find it\nGIT=`which git`\nif [ \"$GIT\" == \"\" ] ; then\n # let's hope it's in /usr/local/bin\n if [ -x \"/usr/local/bin/git\" ] ; then\n GIT=/usr/local/bin/git\n fi\nfi\n\nif [ \"$GIT\" != \"\" ] ; then\n # generate a psuedo-svn revision number from the list of Git revisions\n GITREV=`$GIT log -n1 --format=\"%H\" -- ./`\n GITREVINDEX=`$GIT rev-list --count $GITREV`\n REV=$(($GITREVINDEX + $MAGICNUMBER))\n\n /usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString $BASEVERNUM.$REV\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n /usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $REV\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n /usr/libexec/PlistBuddy -c \"Set :GitRevision string $GITREV\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\nfi";
shellScript = "# add this number to Git revision index to get \"build\" number consistent with old SVN repo\nMAGICNUMBER=482\n\nBASEVERNUM=`/usr/libexec/PlistBuddy -c \"Print :CFBundleShortVersionString\" \"${INFOPLIST_FILE}\"`\n\n# Git isn't installed on 10.6 or earlier by default, so find it\nGIT=`which git`\nif [ \"$GIT\" == \"\" ] ; then\n # let's hope it's in /usr/local/bin\n if [ -x \"/usr/local/bin/git\" ] ; then\n GIT=/usr/local/bin/git\n fi\nfi\n\nif [ \"$GIT\" != \"\" ] ; then\n # generate a pseudo-svn revision number from the list of Git revisions\n GITREV=`$GIT log -n1 --format=\"%H\" -- ./`\n GITREVINDEX=`$GIT rev-list --count $GITREV`\n REV=$(($GITREVINDEX + $MAGICNUMBER))\n\n /usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString $BASEVERNUM.$REV\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n /usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $REV\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\n /usr/libexec/PlistBuddy -c \"Set :GitRevision string $GITREV\" \"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}\"\nfi";
};
/* End PBXShellScriptBuildPhase section */

4
code/apps/pyobjc/MunkiStatus/MunkiStatus/Localize.py
View File

@@ -71,8 +71,8 @@ class LocalizationError(Exception):
def detectEncoding(filepath):
'''
Try to detect the file's encoding.
If its not utf-16 assume it's utf-8, this should work for ascii
files becuase the first 128 characters are the same...
If it's not utf-16 assume it's utf-8, this should work for ascii
files because the first 128 characters are the same...
'''
f = open(filepath, 'r')

2
code/apps/pyobjc/MunkiStatus/MunkiStatus/MSUStatusWindowController.py
View File

@@ -342,7 +342,7 @@ class MSUStatusWindowController(NSObject):
self.got_status_update = True
info = notification.userInfo()
# explictly get keys from info object; PyObjC in Mountain Lion
# explicitly get keys from info object; PyObjC in Mountain Lion
# seems to need this
info_keys = info.keys()
if 'message' in info_keys:

6
code/client/managedsoftwareupdate
View File

@@ -356,7 +356,7 @@ def doRestart(shutdown=False):
else:
if display.munkistatusoutput:
# someone is logged in and we're using Managed Software Center.
# We need to notifiy the active user that a restart is required.
# We need to notify the active user that a restart is required.
# We actually should almost never get here; generally Munki knows
# a restart is needed before even starting the updates and forces
# a logout before applying the updates
@@ -564,7 +564,7 @@ def main():
parser.add_option('--version', '-V', action='store_true',
help='Print the version of the munki tools and exit.')
# commonnly-used options
# commonly-used options
common_options = optparse.OptionGroup(
parser, 'Common Options', 'Commonly used options')
common_options.add_option(
@@ -1028,7 +1028,7 @@ def main():
# if any installs are still requiring force actions, just
# initiate a logout to get started. blocking apps might
# have stopped even non-logout/reboot installs from
# occuring.
# occurring.
if force_action in ['now', 'logout', 'restart']:
mustlogout = True

14
code/client/manifestutil
View File

@@ -49,7 +49,7 @@ def get_installer_item_names(repo, catalog_limit_list):
catalogs_list = repo.itemlist('catalogs')
except munkirepo.RepoError, err:
print >> sys.stderr, (
'Could not retreive catalogs: %s' % unicode(err))
'Could not retrieve catalogs: %s' % unicode(err))
return []
for catalog_name in catalogs_list:
if catalog_name in catalog_limit_list:
@@ -58,7 +58,7 @@ def get_installer_item_names(repo, catalog_limit_list):
catalog = plistlib.readPlistFromString(data)
except munkirepo.RepoError, err:
print >> sys.stderr, (
'Could not retreive catalog %s: %s'
'Could not retrieve catalog %s: %s'
% (catalog_name, unicode(err)))
except (IOError, OSError, ExpatError):
# skip items that aren't valid plists
@@ -79,7 +79,7 @@ def get_manifest_names(repo):
manifest_names = repo.itemlist('manifests')
except munkirepo.RepoError, err:
print >> sys.stderr, (
'Could not retreive manifests: %s' % unicode(err))
'Could not retrieve manifests: %s' % unicode(err))
manifest_names = []
manifest_names.sort()
return manifest_names
@@ -91,7 +91,7 @@ def get_catalogs(repo):
catalog_names = repo.itemlist('catalogs')
except munkirepo.RepoError, err:
print >> sys.stderr, (
'Could not retreive catalogs: %s' % unicode(err))
'Could not retrieve catalogs: %s' % unicode(err))
catalog_names = []
catalog_names.sort()
return catalog_names
@@ -144,7 +144,7 @@ def get_manifest(repo, manifest_name):
data = repo.get(manifest_ref)
return plistlib.readPlistFromString(data)
except munkirepo.RepoError, err:
print >> sys.stderr, (u'Could not retreive manifest %s: %s'
print >> sys.stderr, (u'Could not retrieve manifest %s: %s'
% (manifest_name, unicode(err)))
return None
except (IOError, OSError, ExpatError), err:
@@ -227,7 +227,7 @@ class MyOptParseExit(Exception):
class MyOptionParser(optparse.OptionParser):
'''Custom option parser that overrides the error handler and
the exit handler so printing help doesn't exit the interactive
psuedo-shell'''
pseudo-shell'''
def error(self, msg):
"""error(msg : string)
@@ -659,7 +659,7 @@ def move_install_to_uninstall(repo, args):
else:
if pkgname in manifest['managed_installs']:
manifest['managed_installs'].remove(pkgname)
print ('Removed %s from section %s of mainfest %s' % (pkgname, 'managed_installs', options.manifest))
print ('Removed %s from section %s of manifest %s' % (pkgname, 'managed_installs', options.manifest))
else:
print >> sys.stderr, ('WARNING: Package %s is not in section %s '
'of manifest %s. No changes made.'

2
code/client/munkiimport
View File

@@ -373,7 +373,7 @@ def main():
cleanup_and_exit(-1)
options.uninstalleritem = uninstaller_item
# if catalog/catalogs have not been explictly specified via command-line,
# if catalog/catalogs have not been explicitly specified via command-line,
# add our default catalog
if not options.catalog:
default_catalog = pref('default_catalog') or 'testing'

4
code/client/munkilib/admin/makecatalogslib.py
View File

@@ -90,7 +90,7 @@ def verify_pkginfo(pkginfo_ref, pkginfo, pkgs_list, errors):
# Check if the installer item actually exists
if not installeritempath in pkgs_list:
# do a case-insenstive comparison
# do a case-insensitive comparison
found_caseinsensitive_match = False
for repo_pkg in pkgs_list:
if installeritempath.lower() == repo_pkg.lower():
@@ -132,7 +132,7 @@ def verify_pkginfo(pkginfo_ref, pkginfo, pkgs_list, errors):
# Check if the uninstaller item actually exists
if not uninstalleritempath in pkgs_list:
# do a case-insenstive comparison
# do a case-insensitive comparison
found_caseinsensitive_match = False
for repo_pkg in pkgs_list:
if uninstalleritempath.lower() == repo_pkg.lower():

2
code/client/munkilib/admin/munkiimportlib.py
View File

@@ -239,7 +239,7 @@ def find_matching_pkginfo(repo, pkginfo):
try:
catdb = make_catalog_db(repo)
except CatalogReadException, err:
# could not retreive catalogs/all
# could not retrieve catalogs/all
# do we have any existing pkgsinfo items?
pkgsinfo_items = repo.itemlist('pkgsinfo')
if len(pkgsinfo_items):

2
code/client/munkilib/admin/pkginfolib.py
View File

@@ -938,7 +938,7 @@ def add_option_groups(parser):
forced_unattended_options.add_option(
'--unattended_uninstall', '--unattended-uninstall',
action='store_true',
help='Item can be uninstalled without notifiying the user.')
help='Item can be uninstalled without notifying the user.')
forced_unattended_options.add_option(
'--force_install_after_date', '--force-install-after-date',
metavar='DATE',

4
code/client/munkilib/adobeutils/adobeinfo.py
View File

@@ -297,7 +297,7 @@ def get_xml_text_element(dom_node, name):
def parse_option_xml(option_xml_file):
'''Parses an optionXML.xml file and pulls ot items of interest, returning
'''Parses an optionXML.xml file and pulls the items of interest, returning
them in a dictionary'''
info = {}
dom = minidom.parse(option_xml_file)
@@ -684,7 +684,7 @@ def getAdobeCatalogInfo(mountpoint, pkgname=""):
if pkgname:
cataloginfo['package_path'] = pkgname
# make some (hopfully functional) installs items from the payloads
# make some (hopefully functional) installs items from the payloads
installs = []
uninstalldir = "/Library/Application Support/Adobe/Uninstall"
# first look for a payload with a display_name matching the

4
code/client/munkilib/adobeutils/core.py
View File

@@ -195,7 +195,7 @@ def mount_adobe_dmg(dmgpath):
def get_percent(current, maximum):
'''Returns a value useful with MunkiStatus to use when
displaying precent-done stauts'''
displaying percent-done status'''
if maximum == 0:
percentdone = -1
elif current < 0:
@@ -827,7 +827,7 @@ def adobe_setup_error(errorcode):
13: "Media optimization failed",
14: "Failed due to insufficient privileges",
15: "Media DB Sync Failed",
16: "Failed to laod the Deployment file",
16: "Failed to load the Deployment file",
17: "EULA Acceptance Failed",
18: "C3PO Bootstrap Failed",
19: "Conflicting processes running",

2
code/client/munkilib/app_usage.py
View File

@@ -38,7 +38,7 @@ from . import prefs
# SQLite db to store application usage data
APPLICATION_USAGE_DB = os.path.join(
prefs.pref('ManagedInstallDir'), 'application_usage.sqlite')
# SQL to detect existance of application usage table
# SQL to detect existence of application usage table
APPLICATION_USAGE_TABLE_DETECT = 'SELECT * FROM application_usage LIMIT 1'
# This table creates ~64 bytes of disk data per event.
APPLICATION_USAGE_TABLE_CREATE = (

4
code/client/munkilib/appleupdates/au.py
View File

@@ -741,7 +741,7 @@ class AppleUpdates(object):
if only_unattended:
# Append list of unattended_install items
su_options.extend(unattended_install_items)
# Filter installist to only include items
# Filter installlist to only include items
# which we're attempting to install
filtered_installlist = [item for item in installlist
if item.get('productKey') in
@@ -1010,7 +1010,7 @@ class AppleUpdates(object):
def get_unattended_installs(self):
"""Processes AppleUpdates.plist to return a list
of NAME-VERSION formatted items and a list of product_ids
which are elgible for unattended installation.
which are eligible for unattended installation.
"""
item_list = []
product_ids = []

2
code/client/munkilib/appleupdates/core.py
View File

@@ -59,7 +59,7 @@ def appleSoftwareUpdatesAvailable(forcecheck=False, suppresscheck=False,
if os_version_tuple >= (10, 11):
if munkisuscatalog:
display.display_warning(
"Custom softwareupate catalog %s in Munki's preferences will "
"Custom softwareupdate catalog %s in Munki's preferences will "
"be ignored." % munkisuscatalog)
elif su_prefs.catalogurl_is_managed():
display.display_warning(

4
code/client/munkilib/appleupdates/sync.py
View File

@@ -18,7 +18,7 @@ appleupdates.sync
Created by Greg Neagle on 2017-01-06.
Utilities for replicating and retreiving Apple software update metadata
Utilities for replicating and retrieving Apple software update metadata
"""
import gzip
@@ -474,7 +474,7 @@ class AppleUpdateSync(object):
return list_of_localizations[0]
def distribution_for_product_key(self, product_key, language=None):
'''Returns the path to a distibution file from /Library/Updates
'''Returns the path to a distribution file from /Library/Updates
or the local cache for the given product_key. If language is
defined it will try to retrieve that specific language, otherwise
it will use the available languages and the value of the

4
code/client/munkilib/fetch.py
View File

@@ -564,10 +564,10 @@ def verifySoftwarePackageIntegrity(file_path, item_hash, always_hash=False):
The feature is controlled through the PackageVerificationMode key in
the ManagedInstalls.plist. Following modes currently exist:
none: No integrity check is performed.
hash: Integrity check is performed by calcualting a SHA-256 hash of
hash: Integrity check is performed by calculating a SHA-256 hash of
the given file and comparing it against the reference value in
catalog. Only applies for package plists that contain the
item_key; for packages without the item_key, verifcation always
item_key; for packages without the item_key, verification always
returns True.
hash_strict: Same as hash, but returns False for package plists that
do not contain the item_key.

4
code/client/munkilib/gurl.py
View File

@@ -254,7 +254,7 @@ class Gurl(NSObject):
{kCFNetworkProxiesHTTPEnable: False,
kCFNetworkProxiesHTTPSEnable: False})
# set minumum supported TLS protocol (defaults to TLS1)
# set minimum supported TLS protocol (defaults to TLS1)
configuration.setTLSMinimumSupportedProtocol_(
self.minimum_tls_protocol)
@@ -450,7 +450,7 @@ class Gurl(NSObject):
# not resuming, just open the file for writing
self.destination = open(self.destination_path, 'w')
# store some headers with the file for use if we need to resume
# the downloadand for future checking if the file on the server
# the download and for future checking if the file on the server
# has changed
self.storeHeaders_(download_data)
if completionHandler:

2
code/client/munkilib/info.py
View File

@@ -761,7 +761,7 @@ def add_tzoffset_to_date(the_date):
<Key>condition</key>
<string>date > CAST("2012-12-17T16:00:00Z", "NSDate")</string>
with the intent being that the comparision is against local time.
with the intent being that the comparison is against local time.
"""
# find our time zone offset in seconds

2
code/client/munkilib/installer/core.py
View File

@@ -290,7 +290,7 @@ def install_with_info(
retcode = dmg.copy_from_dmg(itempath, item.get('items_to_copy'))
if retcode == 0 and requires_restart(item):
restartflag = True
# appdmg install (depercated)
# appdmg install (deprecated)
elif installer_type == "appdmg":
display.display_warning(
"install_type 'appdmg' is deprecated. Use 'copy_from_dmg'.")

4
code/client/munkilib/munkicommon.py
View File

@@ -21,8 +21,8 @@ Created by Greg Neagle on 2008-11-18.
Common functions used by the munki tools.
"""
# this module current exists purely for backwards-compatibity so that anything
# calling munkicommon functions will still work (for now)
# this module currently exists purely for backwards compatibility so that
# anything calling munkicommon functions will still work (for now)
# We wildcard-import from submodules for backwards compatibility; functions
# that were previously available from this module

2
code/client/munkilib/munkihash.py
View File

@@ -31,7 +31,7 @@ def gethash(filename, hash_function):
Args:
filename: The file name to calculate the hash value of.
hash_function: The hash function object to use, which was instanciated
hash_function: The hash function object to use, which was instantiated
before calling this function, e.g. hashlib.md5().
Returns:

4
code/client/munkilib/osinstaller.py
View File

@@ -55,7 +55,7 @@ from . import scriptutils
def boot_volume_is_cs_converting():
'''Returns True if the boot volume is in the middle of a CoreStorage
conversion from encypted to decrypted or vice-versa. macOS installs fail
conversion from encrypted to decrypted or vice-versa. macOS installs fail
in this state.'''
try:
output = subprocess.check_output(
@@ -87,7 +87,7 @@ def find_install_macos_app(dir_path):
def install_macos_app_is_stub(app_path):
'''High Sierra downloaded installer is sometimes a "stub" application that
does not contain the InstallESD.dmg. Retune True if the given app path is
does not contain the InstallESD.dmg. Return True if the given app path is
missing the InstallESD.dmg'''
installesd_dmg = os.path.join(
app_path, 'Contents/SharedSupport/InstallESD.dmg')

6
code/client/munkilib/pkgutils.py
View File

@@ -119,7 +119,7 @@ def padVersionString(versString, tupleCount):
def getVersionString(plist, key=None):
"""Gets a version string from the plist.
If a key is explictly specified, the value of that key is
If a key is explicitly specified, the value of that key is
returned without modification, or an empty string if the
key does not exist.
@@ -132,11 +132,11 @@ def getVersionString(plist, key=None):
VersionString = ''
if key:
# admin has specified a specific key
# return value verbatum or empty string
# return value verbatim or empty string
return plist.get(key, '')
# default to CFBundleShortVersionString plus magic
# and workarounds and edge case cleanupds
# and workarounds and edge case cleanups
key = 'CFBundleShortVersionString'
if not 'CFBundleShortVersionString' in plist:
if 'Bundle versions string, short' in plist:

2
code/client/munkilib/updatecheck/analyze.py
View File

@@ -347,7 +347,7 @@ def process_install(manifestitem, cataloglist, installinfo,
# there are two kinds of dependencies/relationships.
#
# 'requires' are prerequistes:
# 'requires' are prerequisites:
# package A requires package B be installed first.
# if package A is removed, package B is unaffected.
# requires can be a one to many relationship.

2
code/client/munkilib/updatecheck/catalogs.py
View File

@@ -625,7 +625,7 @@ def get_catalogs(cataloglist):
catalogdata = FoundationPlist.readPlist(catalogpath)
except FoundationPlist.NSPropertyListSerializationException:
display.display_error(
'Retreived catalog %s is invalid.', catalogname)
'Retrieved catalog %s is invalid.', catalogname)
try:
os.unlink(catalogpath)
except (OSError, IOError):

4
code/client/munkilib/updatecheck/compare.py
View File

@@ -18,7 +18,7 @@ updatecheck.compare
Created by Greg Neagle on 2016-12-13.
Comparsion/checking functions used by updatecheck
Comparison/checking functions used by updatecheck
"""
import os
@@ -277,7 +277,7 @@ def filesystem_item_exists(item):
def compare_item_version(item):
'''Compares an installs_item with what's on the startup disk.
Wraps other comparsion functions.
Wraps other comparison functions.
For applications, bundles, and plists:
Returns 0 if the item isn't installed

2
code/client/munkilib/updatecheck/download.py
View File

@@ -333,7 +333,7 @@ def download_client_resources():
def download_catalog(catalogname):
'''Attempt to download a catalog from the Munki server, Returns the path to
the downlaoded catalog file'''
the downloaded catalog file'''
catalogbaseurl = (prefs.pref('CatalogURL') or
prefs.pref('SoftwareRepoURL') + '/catalogs/')
if not catalogbaseurl.endswith('?') and not catalogbaseurl.endswith('/'):

2
code/client/munkilib/updatecheck/installationstate.py
View File

@@ -288,7 +288,7 @@ def evidence_this_is_installed(item_pl):
display.display_debug2("Installed receipts don't match.")
# if we got this far, we failed all the tests, so the item
# must not be installed (or we dont't have the right info...)
# must not be installed (or we don't have the right info...)
return False

2
code/client/tests/travisci.py
View File

@@ -13,7 +13,7 @@ if out:
print("Time to clean the lint...")
sys.exit(1)
elif err:
print("An error occured!")
print("An error occurred!")
print(err)
sys.exit(1)
else:

6
code/tools/make_munki_mpkg.sh
View File

@@ -125,7 +125,7 @@ if [ "$?" != "0" ]; then
fi
cd "$MUNKIROOT"
# generate a psuedo-svn revision number for the core tools (and admin tools)
# generate a pseudo-svn revision number for the core tools (and admin tools)
# from the list of Git revisions
GITREV=`git log -n1 --format="%H" -- code/client`
GITREVINDEX=`git rev-list --count $GITREV`
@@ -133,7 +133,7 @@ SVNREV=$(($GITREVINDEX + $MAGICNUMBER))
MPKGSVNREV=$SVNREV
VERSION=$MUNKIVERS.$SVNREV
# get a psuedo-svn revision number for the apps pkg
# get a pseudo-svn revision number for the apps pkg
APPSGITREV=`git log -n1 --format="%H" -- code/apps`
GITREVINDEX=`git rev-list --count $APPSGITREV`
APPSSVNREV=$(($GITREVINDEX + $MAGICNUMBER))
@@ -160,7 +160,7 @@ fi
LAUNCHDVERSION=$LAUNCHDVERSION.$LAUNCHDSVNREV
# get a psuedo-svn revision number for the metapackage
# get a pseudo-svn revision number for the metapackage
MPKGVERSION=$MUNKIVERS.$MPKGSVNREV

6
code/tools/make_munki_mpkg_DEP.sh
View File

@@ -123,7 +123,7 @@ if [ "$?" != "0" ]; then
fi
cd "$MUNKIROOT"
# generate a psuedo-svn revision number for the core tools (and admin tools)
# generate a pseudo-svn revision number for the core tools (and admin tools)
# from the list of Git revisions
GITREV=`git log -n1 --format="%H" -- code/client`
GITREVINDEX=`git rev-list --count $GITREV`
@@ -131,7 +131,7 @@ SVNREV=$(($GITREVINDEX + $MAGICNUMBER))
MPKGSVNREV=$SVNREV
VERSION=$MUNKIVERS.$SVNREV
# get a psuedo-svn revision number for the apps pkg
# get a pseudo-svn revision number for the apps pkg
APPSGITREV=`git log -n1 --format="%H" -- code/apps`
GITREVINDEX=`git rev-list --count $APPSGITREV`
APPSSVNREV=$(($GITREVINDEX + $MAGICNUMBER))
@@ -157,7 +157,7 @@ if [ -e "$MUNKIROOT/launchd/version.plist" ]; then
fi
LAUNCHDVERSION=$LAUNCHDVERSION.$LAUNCHDSVNREV
# get a psuedo-svn revision number for the metapackage
# get a pseudo-svn revision number for the metapackage
MPKGVERSION=$MUNKIVERS.$MPKGSVNREV

2
code/tools/pkginfo_hash_updater.py
View File

@@ -55,7 +55,7 @@ def GetHash(filename, hash_function):
Args:
filename: The file name to calculate the hash value of.
hash_function: The hash function object to use, which was instanciated
hash_function: The hash function object to use, which was instantiated
before calling this function, e.g. hashlib.md5().
Returns: