diff --git a/packages/system/suc-upgrade/definition.yaml b/packages/system/suc-upgrade/definition.yaml index f346a51..113b573 100644 --- a/packages/system/suc-upgrade/definition.yaml +++ b/packages/system/suc-upgrade/definition.yaml @@ -1,3 +1,3 @@ name: "suc-upgrade" category: "system" -version: "0.3.1" +version: "0.4.0" diff --git a/packages/system/suc-upgrade/suc-upgrade.sh b/packages/system/suc-upgrade/suc-upgrade.sh index 6ee2329..0a1fd26 100644 --- a/packages/system/suc-upgrade/suc-upgrade.sh +++ b/packages/system/suc-upgrade/suc-upgrade.sh @@ -5,21 +5,28 @@ SUC_VERSION="0.0.0" echo "SUC_VERSION: $SUC_VERSION" +get_version() { + local file_path="$1" + # shellcheck disable=SC1090 + source "$file_path" + + echo "${KAIROS_VERSION}-${KAIROS_SOFTWARE_VERSION_PREFIX}${KAIROS_SOFTWARE_VERSION}" +} + if [ "$FORCE" != "true" ]; then if [ -f "/etc/kairos-release" ]; then - # shellcheck disable=SC1091 - UPDATE_VERSION=$(source /etc/kairos-release && echo "${KAIROS_VERSION}") + UPDATE_VERSION=$(get_version "/etc/kairos-release") else # shellcheck disable=SC1091 - UPDATE_VERSION=$(source /etc/os-release && echo "${KAIROS_VERSION}") + UPDATE_VERSION=$(get_version "/etc/os-release" ) fi if [ -f "${HOST_DIR}/etc/kairos-release" ]; then # shellcheck disable=SC1091 - CURRENT_VERSION=$(source "${HOST_DIR}"/etc/kairos-release && echo "${KAIROS_VERSION}") + CURRENT_VERSION=$(get_version "${HOST_DIR}/etc/kairos-release" ) else # shellcheck disable=SC1091 - CURRENT_VERSION=$(source "${HOST_DIR}"/etc/os-release && echo "${KAIROS_VERSION}") + CURRENT_VERSION=$(get_version "${HOST_DIR}/etc/os-release" ) fi if [ "$CURRENT_VERSION" == "$UPDATE_VERSION" ]; then