Skip to content

Added functionality to download descriptions.json and print out package descriptions when zopen-info is run #1010

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
Kale105 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Added functionality to download descriptions.json and print out package descriptions when zopen-info is run #1010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c27f237
Modified common.sh to download the json file containg package descrip…
Kale105 Apr 14, 2025
caf8d80
Added jqueries to look up package descriptions from descriptions.json…
Kale105 Apr 19, 2025
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
14 changes: 11 additions & 3 deletions bin/zopen-info
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,14 @@ printPackageInfo() {
community_commitsha=$(echo "${remote_data}" | jq -r '.assets[0].community_commitsha')
runtime_dependencies=$(echo "${remote_data}" | jq -r '.assets[0].runtime_dependencies')
build_dependencies=$(jq -r '.product.build_dependencies | unique_by(.name) | map(.name) | join(" ")' ${metadataFile})

package_descriptions=$(jq -r --arg base_package "$base_package" '.descriptions[$base_package]' "${JSON_DESCRIPTIONS_CACHE}")

printHeader "==> ${name} (Not Installed)"

printHeader "==> Package"
if [ -n "$package_descriptions" ]; then
printf "%-20s %s\n" "Description:" "$package_descriptions"
fi
printf "%-20s %s\n" "Version:" "${version}"
printf "%-20s %s\n" "Release:" "${release}"
printf "%-20s %s\n" "Buildline:" "${buildline}"
Expand Down Expand Up @@ -163,6 +167,7 @@ printPackageInfo() {
size=$(jq -r '.product.size' "${metadata}")
commitsha=$(jq -r '.product.commitsha' "${metadata}")
community_commitsha=$(jq -r '.product.community_commitsha' "${metadata}")
package_descriptions=$(jq -r --arg package "$package" '.descriptions[$package]' "${JSON_DESCRIPTIONS_CACHE}")
Copy link
Member

@IgorTodorovskiIBM IgorTodorovskiIBM Apr 21, 2025

Choose a reason for hiding this comment

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

We should probably check if JSON_DESCRIPTIONS_CACHE exists first. You can do that with `if [ -r "${JSON_DESCRIPTIONS_CACHE}" ]


# Use jq's --exit-status option to handle null values gracefully
build_dependencies=$(jq -r '.product.build_dependencies | map(.name) | join(", ")' --exit-status "${metadata}")
Expand Down Expand Up @@ -191,7 +196,11 @@ printPackageInfo() {
installed_path=$(cd "${ZOPEN_PKGINSTALL}/${package}/${package}" > /dev/null 2>&1 && pwd -P)

printHeader "==> ${name}: ${buildline} ${dotversion}"
printf "%-20s %s\n" "Description:" "${summary}"
if [ -n "$package_descriptions" ]; then
printf "%-20s %s\n" "Description:" "$package_descriptions"
else
printf "%-20s %s\n" "Description:" "$summary"
fi

printHeader "==> Package"
printf "%-20s %s\n" "Version:" "${dotversion}"
Expand All @@ -203,7 +212,6 @@ printPackageInfo() {
printf "%-20s %s\n" "GitHub:" "${repo}"
printf "%-20s %s\n" "License:" "${license}"
printf "%-20s %s\n" "zopen license:" "${zopen_license}"

printHeader "==> Installation Details"
printf "%-20s %s\n" "Installed:" "Yes"
printf "%-20s %s\n" "Installation Path:" "${installed_path}"
Expand Down
8 changes: 8 additions & 0 deletions include/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ zopenInitialize()
fi
ZOPEN_ANALYTICS_JSON="${ZOPEN_ROOTFS}/var/lib/zopen/analytics.json"
ZOPEN_JSON_CACHE_URL="https://raw.githubusercontent.com/zopencommunity/meta/main/docs/api/zopen_releases.json"
ZOPEN_DESCRIPTIONS_CACHE_URL="https://raw.githubusercontent.com/ZOSOpenTools/meta/main/docs/api/zopen_releases_descriptions.json"
ZOPEN_JSON_CONFIG="${ZOPEN_ROOTFS}/etc/zopen/config.json"
if [ -n "${INCDIR}" ]; then
ZOPEN_SYSTEM_PREREQ_SCRIPT="${INCDIR}/prereq.sh"
Expand Down Expand Up @@ -1240,6 +1241,7 @@ downloadJSONCache()
cachedir="${ZOPEN_ROOTFS}/var/cache/zopen"
[ ! -e "${cachedir}" ] && mkdir -p "${cachedir}"
JSON_CACHE="${cachedir}/zopen_releases.json"
JSON_DESCRIPTIONS_CACHE="${cachedir}/zopen_releases_descriptions.json"
JSON_TIMESTAMP="${cachedir}/zopen_releases.timestamp"
JSON_TIMESTAMP_CURRENT="${cachedir}/zopen_releases.timestamp.current"

Expand Down Expand Up @@ -1276,6 +1278,12 @@ downloadJSONCache()
printError "Failed to obtain json cache from ${ZOPEN_JSON_CACHE_URL}; ${curlout}"
fi
chtag -tc 819 "${JSON_CACHE}"

if ! curlout=$(curlCmd -L --no-progress-meter -o "${JSON_DESCRIPTIONS_CACHE}" "${ZOPEN_DESCRIPTIONS_CACHE_URL}"); then
printError "Failed to obtain descriptions cache from ${ZOPEN_DESCRIPTIONS_CACHE_URL}; ${curlout}"
fi
chtag -tc 819 "${JSON_DESCRIPTIONS_CACHE}"

fi

if [ ! -f "${JSON_CACHE}" ]; then
Expand Down
Loading