Skip to content

Commit 421ee1d

Browse files
authored
Bump suc-provider to deal with newer versions (#1389)
1 parent ce6e9bf commit 421ee1d

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
name: "suc-upgrade"
22
category: "system"
3-
version: "0.3.1"
3+
version: "0.4.0"

packages/system/suc-upgrade/suc-upgrade.sh

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,28 @@ SUC_VERSION="0.0.0"
55

66
echo "SUC_VERSION: $SUC_VERSION"
77

8+
get_version() {
9+
local file_path="$1"
10+
# shellcheck disable=SC1090
11+
source "$file_path"
12+
13+
echo "${KAIROS_VERSION}-${KAIROS_SOFTWARE_VERSION_PREFIX}${KAIROS_SOFTWARE_VERSION}"
14+
}
15+
816
if [ "$FORCE" != "true" ]; then
917
if [ -f "/etc/kairos-release" ]; then
10-
# shellcheck disable=SC1091
11-
UPDATE_VERSION=$(source /etc/kairos-release && echo "${KAIROS_VERSION}")
18+
UPDATE_VERSION=$(get_version "/etc/kairos-release")
1219
else
1320
# shellcheck disable=SC1091
14-
UPDATE_VERSION=$(source /etc/os-release && echo "${KAIROS_VERSION}")
21+
UPDATE_VERSION=$(get_version "/etc/os-release" )
1522
fi
1623

1724
if [ -f "${HOST_DIR}/etc/kairos-release" ]; then
1825
# shellcheck disable=SC1091
19-
CURRENT_VERSION=$(source "${HOST_DIR}"/etc/kairos-release && echo "${KAIROS_VERSION}")
26+
CURRENT_VERSION=$(get_version "${HOST_DIR}/etc/kairos-release" )
2027
else
2128
# shellcheck disable=SC1091
22-
CURRENT_VERSION=$(source "${HOST_DIR}"/etc/os-release && echo "${KAIROS_VERSION}")
29+
CURRENT_VERSION=$(get_version "${HOST_DIR}/etc/os-release" )
2330
fi
2431

2532
if [ "$CURRENT_VERSION" == "$UPDATE_VERSION" ]; then

0 commit comments

Comments
 (0)