Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ expectedAwscliTeamID="94KV3E626L"
StartDiagnostics () {

if [ "$customDuration" == "" ]; then
echo "Staring Jamf Protect Diagnostics for a duration of 5 minutes"
echo "Starting Jamf Protect Diagnostics for a duration of 5 minutes"
/usr/local/bin/protectctl diagnostics
else
echo "Staring Jamf Protect Diagnostics for a duration of $customDuration minutes"
echo "Starting Jamf Protect Diagnostics for a duration of $customDuration minutes"
/usr/local/bin/protectctl diagnostics -d "$customDuration"
fi
}
Expand Down Expand Up @@ -130,7 +130,7 @@ CollectArchive () {
export AWS_CONFIG_FILE="$awsFolder"/config
export AWS_SHARED_CREDENTIALS_FILE="$awsFolder"/credentials

# Use the AWS CLI to copy the archive to the desginated bucket
# Use the AWS CLI to copy the archive to the designated bucket
echo "The AWS binary is present, initiating the upload.."
"$awsBinary" s3 cp "/Users/$loggedInUser/Desktop/" s3://"$s3Bucket" --recursive --exclude "*" --include "JamfProtectDiagnostics*"

Expand Down Expand Up @@ -175,7 +175,7 @@ NetworkCheckAndUpload () {
# Clean up and end this workflow
CleanUp () {

# Clean up the Jamf Protect Diagnostics archive if upload was sucecessful
# Clean up the Jamf Protect Diagnostics archive if upload was successful
echo "Removing Jamf Protect Diagnostics archive."
if [[ "$uploadStatus" -eq 0 ]]; then
/bin/rm "/Users/$loggedInUser"/JamfProtectDiagnostics*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ expectedAzcopyTeamID="94KV3E626L"
StartDiagnostics () {

if [ "$customDuration" == "" ]; then
echo "Staring Jamf Protect Diagnostics for a duration of 5 minutes"
echo "Starting Jamf Protect Diagnostics for a duration of 5 minutes"
/usr/local/bin/protectctl diagnostics
else
echo "Staring Jamf Protect Diagnostics for a duration of $customDuration minutes"
echo "Starting Jamf Protect Diagnostics for a duration of $customDuration minutes"
/usr/local/bin/protectctl diagnostics -d "$customDuration"
fi
}
Expand Down Expand Up @@ -128,7 +128,7 @@ CollectArchive () {

if [[ "$azcopyInstallStatus" -eq 0 ]]; then

# Use the Azure Copy CLI to copy the archive to the desginated bucket
# Use the Azure Copy CLI to copy the archive to the designated bucket
echo "The Azure Copy binary is present, initiating the upload.."
"$azcopyBinary/azcopy" copy "/Users/$loggedInUser/Desktop"/*JamfProtectDiagnostics*.zip "https://${azureStorageAccount}.file.core.windows.net/${azureFileShareName}/${azureFileShareFolder}/${azureSasToken}" --recursive=true

Expand Down Expand Up @@ -171,7 +171,7 @@ NetworkCheckAndUpload () {
# Clean up and end this workflow
CleanUp () {

# Clean up the Jamf Protect Diagnostics archive if upload was sucecessful
# Clean up the Jamf Protect Diagnostics archive if upload was successful
echo "Removing Jamf Protect Diagnostics archive."
if [[ "$uploadStatus" -eq 0 ]]; then
/bin/rm "/Users/$loggedInUser"/JamfProtectDiagnostics*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ loggedInUser=$(scutil <<< "show State:/Users/ConsoleUser" | awk '/Name :/ && ! /
StartDiagnostics () {

if [ "$customDuration" == "" ]; then
echo "Staring Jamf Protect Diagnostics for a duration of 5 minutes"
echo "Starting Jamf Protect Diagnostics for a duration of 5 minutes"
/usr/local/bin/protectctl diagnostics
else
echo "Staring Jamf Protect Diagnostics for a duration of $customDuration minutes"
echo "Starting Jamf Protect Diagnostics for a duration of $customDuration minutes"
/usr/local/bin/protectctl diagnostics -d "$customDuration"
fi
}
Expand Down Expand Up @@ -106,7 +106,7 @@ CollectArchive () {
if [[ "$botoConfigStatus" -eq 0 ]]; then
export BOTO_CONFIG="$botoConfig"

# Use the gsutil to copy the archive to the desginated bucket
# Use the gsutil to copy the archive to the designated bucket
echo "Gsutil is present, initiating the upload.."
"$gsutilBinary" cp "/Users/$loggedInUser/Desktop"/JamfProtectDiagnostics* gs://"$gcsBucket"

Expand Down Expand Up @@ -151,7 +151,7 @@ NetworkCheckAndUpload () {
# Clean up and end this workflow
CleanUp () {

# Clean up the Jamf Protect Diagnostics archive if upload was sucecessful
# Clean up the Jamf Protect Diagnostics archive if upload was successful
echo "Removing Jamf Protect Diagnostics archive."
if [[ "$uploadStatus" -eq 0 ]]; then
/bin/rm "/Users/$loggedInUser"/JamfProtectDiagnostics*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ CollectArchive () {
export AWS_CONFIG_FILE="$awsFolder"/config
export AWS_SHARED_CREDENTIALS_FILE="$awsFolder"/credentials

# Use the AWS CLI to copy the archive to the desginated bucket
# Use the AWS CLI to copy the archive to the designated bucket
echo "The AWS binary is present, initiating the upload.."
"$awsBinary" s3 cp "$aftermathArchiveDir" s3://"$s3Bucket" --recursive --exclude "*" --include "Aftermath*"

Expand Down Expand Up @@ -152,7 +152,7 @@ NetworkCheckAndUpload () {
# Clean up and end this workflow
CleanUp () {

# Clean up the Aftermath archive if upload was sucecessful
# Clean up the Aftermath archive if upload was successful
echo "Removing Aftermath archive."
if [[ "$uploadStatus" -eq 0 ]]; then
/bin/rm "$aftermathArchiveDir"/Aftermath*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ CollectArchive () {

if [[ "$azcopyInstallStatus" -eq 0 ]]; then

# Use the Azure Copy CLI to copy the archive to the desginated bucket
# Use the Azure Copy CLI to copy the archive to the designated bucket
echo "The Azure Copy binary is present, initiating the upload.."
"$azcopyBinary/azcopy" copy "${aftermathArchiveDir}"/*Aftermath*.zip "https://${azureStorageAccount}.file.core.windows.net/${azureFileShareName}/${azureFileShareFolder}/${azureSasToken}" --recursive=true

Expand Down Expand Up @@ -150,7 +150,7 @@ NetworkCheckAndUpload () {
# Clean up and end this workflow
CleanUp () {

# Clean up the Aftermath archive if upload was sucecessful
# Clean up the Aftermath archive if upload was successful
echo "Removing Aftermath archive."
if [[ "$uploadStatus" -eq 0 ]]; then
/bin/rm "$aftermathArchiveDir"/Aftermath*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ CheckForFiles () {
fi
}

# Upload the Aftermath archive to Google Clound Bucket using gsutil
# Upload the Aftermath archive to Google Cloud Bucket using gsutil
CollectArchive () {
if [[ -n "$gcsBucket" ]]; then

Expand All @@ -83,7 +83,7 @@ CollectArchive () {
if [[ "$botoConfigStatus" -eq 0 ]]; then
export BOTO_CONFIG="$botoConfig"

# Use the gsutil to copy the archive to the desginated bucket
# Use the gsutil to copy the archive to the designated bucket
echo "Gsutil is present, initiating the upload.."
"$gsutilBinary" cp "$aftermathArchiveDir"/Aftermath* gs://"$gcsBucket"

Expand Down Expand Up @@ -128,7 +128,7 @@ NetworkCheckAndUpload () {
# Clean up and end this workflow
CleanUp () {

# Clean up the Aftermath archive if upload was sucecessful
# Clean up the Aftermath archive if upload was successful
echo "Removing Aftermath archive."
if [[ "$uploadStatus" -eq 0 ]]; then
/bin/rm "$aftermathArchiveDir"/Aftermath*
Expand Down