Skip to content

Commit ef30fdf

Browse files
committed
Use $pkg to refer to the release package name
The `pkg` variable already refers to the release package name, so just use that.
1 parent f27fda0 commit ef30fdf

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

tasks/install_shell.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -595,8 +595,8 @@ install_file() {
595595
if echo $2 | grep $pkg; then
596596
info "No collection upgrade detected"
597597
else
598-
info "Collection upgrade detected, replacing puppet${major}-release"
599-
rpm -e "puppet${major}-release"
598+
info "Collection upgrade detected, replacing $pkg"
599+
rpm -e "$pkg"
600600
fi
601601
fi
602602

@@ -626,8 +626,8 @@ install_file() {
626626
if echo $2 | grep $pkg; then
627627
info "No collection upgrade detected"
628628
else
629-
info "Collection upgrade detected, replacing puppet${major}-release"
630-
zypper remove --no-confirm "puppet${major}-release"
629+
info "Collection upgrade detected, replacing $pkg"
630+
zypper remove --no-confirm "$pkg"
631631
fi
632632
fi
633633

@@ -655,8 +655,8 @@ install_file() {
655655
if echo $2 | grep $pkg; then
656656
info "No collection upgrade detected"
657657
else
658-
info "Collection upgrade detected, replacing puppet${major}-release"
659-
dpkg --purge "puppet${major}-release"
658+
info "Collection upgrade detected, replacing $pkg"
659+
dpkg --purge "$pkg"
660660
fi
661661
fi
662662

0 commit comments

Comments
 (0)