Skip to content

Commit

Permalink
Remove trailing whitespace (k3s-io#9362)
Browse files Browse the repository at this point in the history
* Remove trailing whitespace from install.sh

Signed-off-by: Papiris <contributions@ingeniorskap.no>

* Update install.sh.sha256sum

Signed-off-by: Papiris <contributions@ingeniorskap.no>

---------

Signed-off-by: Papiris <contributions@ingeniorskap.no>
  • Loading branch information
ruzko authored Oct 2, 2024
1 parent 7ca021e commit f288cce
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
19 changes: 9 additions & 10 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -280,11 +280,11 @@ can_skip_download_binary() {
fi
}

can_skip_download_selinux() {
if [ "${INSTALL_K3S_SKIP_DOWNLOAD}" != true ] && [ "${INSTALL_K3S_SKIP_DOWNLOAD}" != selinux ]; then
return 1
fi
}
can_skip_download_selinux() {
if [ "${INSTALL_K3S_SKIP_DOWNLOAD}" != true ] && [ "${INSTALL_K3S_SKIP_DOWNLOAD}" != selinux ]; then
return 1
fi
}

# --- verify an executable k3s binary is installed ---
verify_k3s_is_executable() {
Expand Down Expand Up @@ -385,7 +385,7 @@ get_release_version() {
get_k3s_selinux_version() {
available_version="k3s-selinux-1.2-2.${rpm_target}.noarch.rpm"
info "Finding available k3s-selinux versions"

# run verify_downloader in case it binary installation was skipped
verify_downloader curl || verify_downloader wget || fatal 'Can not find curl or wget for downloading files'

Expand Down Expand Up @@ -552,7 +552,7 @@ setup_binary() {

# --- setup selinux policy ---
setup_selinux() {
case ${INSTALL_K3S_CHANNEL} in
case ${INSTALL_K3S_CHANNEL} in
*testing)
rpm_channel=testing
;;
Expand Down Expand Up @@ -614,7 +614,7 @@ setup_selinux() {
info "Skipping installation of SELinux RPM"
return
fi

get_k3s_selinux_version
install_selinux_rpm ${rpm_site} ${rpm_channel} ${rpm_target} ${rpm_site_infix}

Expand Down Expand Up @@ -683,7 +683,7 @@ EOF
if [ "${rpm_installer}" = "yum" ] && [ -x /usr/bin/dnf ]; then
rpm_installer=dnf
fi
if rpm -q --quiet k3s-selinux; then
if rpm -q --quiet k3s-selinux; then
# remove k3s-selinux module before upgrade to allow container-selinux to upgrade safely
if check_available_upgrades container-selinux ${3} && check_available_upgrades k3s-selinux ${3}; then
MODULE_PRIORITY=$($SUDO semodule --list=full | grep k3s | cut -f1 -d" ")
Expand Down Expand Up @@ -1150,4 +1150,3 @@ eval set -- $(escape "${INSTALL_K3S_EXEC}") $(quote "$@")
create_service_file
service_enable_and_start
}
2 changes: 1 addition & 1 deletion install.sh.sha256sum
Original file line number Diff line number Diff line change
@@ -1 +1 @@
f60c3d8940dfc896f7d83aaf57726c91cf21afc4bca40036472df108d9700b4b install.sh
e0fbc48a74045ae279bde25bf6ac5502b256017d4d648b53750050993d4b71e6 install.sh

0 comments on commit f288cce

Please sign in to comment.