Skip to content

Commit 17d8cb8

Browse files
committed
fix(experiment/run-library.sh): Deal better with stream releases
1 parent 01fd980 commit 17d8cb8

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

experiment/run-library.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,12 @@ function status_data_create() {
163163
sd_kat_ver="$6"
164164
sd_kat_ver_short=$( echo "$sd_kat_ver" | sed 's/^katello-//' | sed 's/[^0-9.-]//g' | sed 's/^\([0-9]\+\.[0-9]\+\)\..*/\1/' | sed 's/^N\/A$/0.0/' ) # "katello-3.16.0-0.2.master.el7.noarch" -> "3.16"
165165
sd_sat_ver="$7"
166-
if [[ "$(echo "$sd_sat_ver" | awk -F'.' '{print $(NF-2)}')" == 'stream' ]]; then
166+
if [[ "${sd_sat_ver}" == 'stream' ]]; then
167+
sd_sat_ver_short=stream
168+
elif [[ "$(echo "${sd_sat_ver}" | awk -F'.' '{print $(NF-2)}')" == 'stream' ]]; then
167169
sd_sat_ver_short=stream
168170
else
169-
sd_sat_ver_short=$( echo "$sd_sat_ver" | sed 's/^satellite-//' | sed 's/[^0-9.-]//g' | sed 's/^\([0-9]\+\.[0-9]\+\)\..*/\1/' | sed 's/^N\/A$/0.0/' ) # "satellite-6.6.0-1.el7.noarch" -> "6.6"
171+
sd_sat_ver_short=$( echo "${sd_sat_ver}" | sed 's/^satellite-//' | sed 's/[^0-9.-]//g' | sed 's/^\([0-9]\+\.[0-9]\+\)\..*/\1/' | sed 's/^N\/A$/0.0/' ) # "satellite-6.6.0-1.el7.noarch" -> "6.6"
170172
fi
171173
sd_run="$8"
172174
sd_additional="$9"

0 commit comments

Comments
 (0)