Skip to content

Release 1.2.1 finishing touches #73

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.

Sign up for GitHub

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

Merged
merged 11 commits into from
Sep 16, 2020
Merged

Release 1.2.1 finishing touches #73

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
18b2127
added some whitespace that should fail the swiftlint github action
watkyn Sep 14, 2020
c076ac0
trying out the exact syntax from the docs
watkyn Sep 14, 2020
146f6d8
added --strict to make sure the PR will fail when not resolved (hopef…
watkyn Sep 14, 2020
8831942
changed from master to 3.1.0
watkyn Sep 14, 2020
c379c2e
Merge branch 'master' of github.com:jamf/PPPC-Utility into test-git-a…
watkyn Sep 14, 2020
5b30ea2
Testing out reverting the code signing to help fix the internal bulid…
watkyn Sep 14, 2020
1f5dd0f
removed the swiftlint warnings again now that we know the action is w…
watkyn Sep 15, 2020
f6ed3c2
Added an alert as to go along with the print statement so that the us…
watkyn Sep 15, 2020
9df73d9
Merge branch 'master' of github.com:jamf/PPPC-Utility into release-1.…
watkyn Sep 15, 2020
1d50590
added Jenkinsfile for internal builds and releases
watkyn Sep 15, 2020
11cb145
Removed the Jenkinsfile for now
watkyn Sep 15, 2020
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
7 changes: 5 additions & 2 deletions Source/JamfProClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,14 @@ struct JamfProClient {
sendRequest(endpoint: "osxconfigurationprofiles", data: xml.xmlData) { (statusCode, resultData) in
let success: Bool = (200 <= statusCode && statusCode <= 299)
if !success {
var errMessage = ""
if let text = String(data: resultData, encoding: .utf8) {
print("Error (\(statusCode)):\n\(text)")
errMessage = "Error (\(statusCode)):\n\(text)"
} else {
print("Unknown error: \(statusCode)")
errMessage = "Unknown error: \(statusCode)"
}
print(errMessage)
Alert().display(header: "Upload failed", message: errMessage)
Copy link
Contributor

@kkot kkot Sep 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Alert().display(header: "Upload failed", message: errMessage)
Alert().display(header: "Upload failed:", message: errMessage)

Copy link
Contributor

@hisaac hisaac Sep 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we want a colon at the end of the header. The header describes the situation on one line, and then the message gives more detail, and the message already has a colon, so it would look strange to have two colons.

Copy link
Contributor

@kkot kkot Sep 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just saw that there is a colon in other messages for example "Attention:".

Copy link
Contributor

@hisaac hisaac Sep 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah dang, I didn't notice it there.

}
completionBlock(success)
}
Expand Down