Skip to content

Add deferral tracking to available updates EA and add last update check time EA #12

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

Open
AndrewMBarnett wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add deferral tracking to available updates EA and add last update check time EA #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 30 additions & 0 deletions Extension-Attributes/apps-last-update-check-time.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#!/bin/bash

# Last Update Check
#
# This attribute returns the last time Alectrona Patch ran an update check.
#
# Exit if Alectrona Patch is not installed
if [[ ! -e /Library/Application\ Support/Alectrona/Patch/patch ]]; then
exit 1
fi

# Generate the report
report=$(/Library/Application\ Support/Alectrona/Patch/patch report --updatable 2>/dev/null)
if [[ -z "$report" ]]; then
echo "<result>No report available</result>"
exit 0
fi

# Extract the last update check timestamp
lastCheck=$(echo "$report" | /usr/bin/plutil -extract patchInfo.lastUpdateTaskRun raw -o - -) || {
echo "<result>Unknown</result>"
exit 0
}

epoch=$(date -j -u -f "%Y-%m-%dT%H:%M:%SZ" "$lastCheck" "+%s")
localTime=$(date -r "$epoch" "+%Y-%m-%d %H:%M:%S %Z")

echo "<result>$localTime</result>"

exit 0
35 changes: 35 additions & 0 deletions Extension-Attributes/apps-last-update-check-time.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?><extensionAttribute>
<displayName>Apps Last Update Check Time</displayName>
<description>This attribute returns the last time Alectrona Patch ran an update check.</description>
<dataType>string</dataType>
<scriptContentsMac>#!/bin/bash

# Last Update Check
#
# This attribute returns the last time Alectrona Patch ran an update check.
#
# Exit if Alectrona Patch is not installed
if [[ ! -e /Library/Application\ Support/Alectrona/Patch/patch ]]; then
exit 1
fi

# Generate the report
report=$(/Library/Application\ Support/Alectrona/Patch/patch report --updatable 2&gt;/dev/null)
if [[ -z "$report" ]]; then
echo "&lt;result&gt;No report available&lt;/result&gt;"
exit 0
fi

# Extract the last update check timestamp
lastCheck=$(echo "$report" | /usr/bin/plutil -extract patchInfo.lastUpdateTaskRun raw -o - -) || {
echo "&lt;result&gt;Unknown&lt;/result&gt;"
exit 0
}

epoch=$(date -j -u -f "%Y-%m-%dT%H:%M:%SZ" "$lastCheck" "+%s")
localTime=$(date -r "$epoch" "+%Y-%m-%d %H:%M:%S %Z")

echo "&lt;result&gt;$localTime&lt;/result&gt;"

exit 0</scriptContentsMac>
</extensionAttribute>
22 changes: 15 additions & 7 deletions Extension-Attributes/apps-with-available-updates.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/bin/bash

# Apps With Available Updates

#
# This attribute returns all installed apps that are updatable (out-of-date) using Alectrona Patch.

#
# Exit if Alectrona Patch is not installed
if [[ ! -e /Library/Application\ Support/Alectrona/Patch/patch ]]; then
exit 1
Expand All @@ -27,18 +27,26 @@ fi

# Loop through the appInventory array and build the result
for ((index=0; index<length; index++)); do
appID=$(echo "$report" | /usr/bin/plutil -extract appInventory.$index.id raw -o - -)
installedVersion=$(echo "$report" | /usr/bin/plutil -extract appInventory.$index.version raw -o - -)
targetVersion=$(echo "$report" | /usr/bin/plutil -extract appInventory.$index.targetVersion raw -o - -)
appID=$(echo "$report" | /usr/bin/plutil -extract appInventory.$index.id raw -o - -) || continue
installedVersion=$(echo "$report" | /usr/bin/plutil -extract appInventory.$index.version raw -o - -) || continue
targetVersion=$(echo "$report" | /usr/bin/plutil -extract appInventory.$index.targetVersion raw -o - -) || continue
deferralLimit=$(echo "$report" | /usr/bin/plutil -extract appInventory.$index.deferralLimit raw -o - -) || continue
deferralCount=$(echo "$report" | /usr/bin/plutil -extract appInventory.$index.deferralCount raw -o - - 2>/dev/null) || deferralCount=0
deferralsRemaining=$(( deferralLimit - deferralCount ))

# Add the app to the array
updatableApps+=("ID: $appID\nInstalled Version: $installedVersion\nAvailable Version: $targetVersion\n")
updatableApps+=("ID: $appID"$'\n'"Installed Version: $installedVersion"$'\n'"Available Version: $targetVersion"$'\n'"Deferrals Remaining: $deferralsRemaining"$'\n')
done

# Join array elements with newlines
if [[ "${#updatableApps[@]}" -eq 0 ]]; then
echo "<result>No updatable apps</result>"
exit 0
fi

result=$(printf "%s\n" "${updatableApps[@]}")

# Return the result
echo -e "<result>$result</result>"
printf "<result>%b</result>\n" "$result"

exit 0
94 changes: 51 additions & 43 deletions Extension-Attributes/apps-with-available-updates.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,48 +2,56 @@
<displayName>Apps With Available Updates</displayName>
<description>This attribute returns all installed apps that are updatable (out-of-date) using Alectrona Patch.</description>
<dataType>string</dataType>
<scriptContentsMac>#!/bin/bash&#13;
&#13;
# Apps With Available Updates&#13;
&#13;
# This attribute returns all installed apps that are updatable (out-of-date) using Alectrona Patch.&#13;
&#13;
# Exit if Alectrona Patch is not installed&#13;
if [[ ! -e /Library/Application\ Support/Alectrona/Patch/patch ]]; then&#13;
exit 1&#13;
fi&#13;
&#13;
# Generate the report&#13;
report=$(/Library/Application\ Support/Alectrona/Patch/patch report --updatable 2&gt;/dev/null)&#13;
if [[ -z "$report" ]]; then&#13;
echo "&lt;result&gt;No updatable apps&lt;/result&gt;"&#13;
exit 0&#13;
fi&#13;
&#13;
# Get the length of the appInventory array&#13;
length=$(echo "$report" | /usr/bin/plutil -extract appInventory raw -o - -)&#13;
updatableApps=()&#13;
&#13;
if [[ "$length" -eq 0 ]]; then&#13;
echo "&lt;result&gt;No updatable apps&lt;/result&gt;"&#13;
exit 0&#13;
fi&#13;
&#13;
# Loop through the appInventory array and build the result&#13;
for ((index=0; index&lt;length; index++)); do&#13;
appID=$(echo "$report" | /usr/bin/plutil -extract appInventory.$index.id raw -o - -)&#13;
installedVersion=$(echo "$report" | /usr/bin/plutil -extract appInventory.$index.version raw -o - -)&#13;
targetVersion=$(echo "$report" | /usr/bin/plutil -extract appInventory.$index.targetVersion raw -o - -)&#13;
&#13;
# Add the app to the array&#13;
updatableApps+=("ID: $appID\nInstalled Version: $installedVersion\nAvailable Version: $targetVersion\n")&#13;
done&#13;
&#13;
# Join array elements with newlines&#13;
result=$(printf "%s\n" "${updatableApps[@]}")&#13;
&#13;
# Return the result&#13;
echo -e "&lt;result&gt;$result&lt;/result&gt;"&#13;
&#13;
<scriptContentsMac>#!/bin/bash

# Apps With Available Updates
#
# This attribute returns all installed apps that are updatable (out-of-date) using Alectrona Patch.
#
# Exit if Alectrona Patch is not installed
if [[ ! -e /Library/Application\ Support/Alectrona/Patch/patch ]]; then
exit 1
fi

# Generate the report
report=$(/Library/Application\ Support/Alectrona/Patch/patch report --updatable 2&gt;/dev/null)
if [[ -z "$report" ]]; then
echo "&lt;result&gt;No updatable apps&lt;/result&gt;"
exit 0
fi

# Get the length of the appInventory array
length=$(echo "$report" | /usr/bin/plutil -extract appInventory raw -o - -)
updatableApps=()

if [[ "$length" -eq 0 ]]; then
echo "&lt;result&gt;No updatable apps&lt;/result&gt;"
exit 0
fi

# Loop through the appInventory array and build the result
for ((index=0; index&lt;length; index++)); do
appID=$(echo "$report" | /usr/bin/plutil -extract appInventory.$index.id raw -o - -) || continue
installedVersion=$(echo "$report" | /usr/bin/plutil -extract appInventory.$index.version raw -o - -) || continue
targetVersion=$(echo "$report" | /usr/bin/plutil -extract appInventory.$index.targetVersion raw -o - -) || continue
deferralLimit=$(echo "$report" | /usr/bin/plutil -extract appInventory.$index.deferralLimit raw -o - -) || continue
deferralCount=$(echo "$report" | /usr/bin/plutil -extract appInventory.$index.deferralCount raw -o - - 2&gt;/dev/null) || deferralCount=0
deferralsRemaining=$(( deferralLimit - deferralCount ))

# Add the app to the array
updatableApps+=("ID: $appID"$'\n'"Installed Version: $installedVersion"$'\n'"Available Version: $targetVersion"$'\n'"Deferrals Remaining: $deferralsRemaining"$'\n')
done

# Join array elements with newlines
if [[ "${#updatableApps[@]}" -eq 0 ]]; then
echo "&lt;result&gt;No updatable apps&lt;/result&gt;"
exit 0
fi

result=$(printf "%s\n" "${updatableApps[@]}")

# Return the result
printf "&lt;result&gt;%b&lt;/result&gt;\n" "$result"

exit 0</scriptContentsMac>
</extensionAttribute>