Skip to content

Commit f288cce

Browse files
authored
Remove trailing whitespace (#9362)
* 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>
1 parent 7ca021e commit f288cce

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

install.sh

+9-10
Original file line numberDiff line numberDiff line change
@@ -280,11 +280,11 @@ can_skip_download_binary() {
280280
fi
281281
}
282282

283-
can_skip_download_selinux() {
284-
if [ "${INSTALL_K3S_SKIP_DOWNLOAD}" != true ] && [ "${INSTALL_K3S_SKIP_DOWNLOAD}" != selinux ]; then
285-
return 1
286-
fi
287-
}
283+
can_skip_download_selinux() {
284+
if [ "${INSTALL_K3S_SKIP_DOWNLOAD}" != true ] && [ "${INSTALL_K3S_SKIP_DOWNLOAD}" != selinux ]; then
285+
return 1
286+
fi
287+
}
288288

289289
# --- verify an executable k3s binary is installed ---
290290
verify_k3s_is_executable() {
@@ -385,7 +385,7 @@ get_release_version() {
385385
get_k3s_selinux_version() {
386386
available_version="k3s-selinux-1.2-2.${rpm_target}.noarch.rpm"
387387
info "Finding available k3s-selinux versions"
388-
388+
389389
# run verify_downloader in case it binary installation was skipped
390390
verify_downloader curl || verify_downloader wget || fatal 'Can not find curl or wget for downloading files'
391391

@@ -552,7 +552,7 @@ setup_binary() {
552552

553553
# --- setup selinux policy ---
554554
setup_selinux() {
555-
case ${INSTALL_K3S_CHANNEL} in
555+
case ${INSTALL_K3S_CHANNEL} in
556556
*testing)
557557
rpm_channel=testing
558558
;;
@@ -614,7 +614,7 @@ setup_selinux() {
614614
info "Skipping installation of SELinux RPM"
615615
return
616616
fi
617-
617+
618618
get_k3s_selinux_version
619619
install_selinux_rpm ${rpm_site} ${rpm_channel} ${rpm_target} ${rpm_site_infix}
620620

@@ -683,7 +683,7 @@ EOF
683683
if [ "${rpm_installer}" = "yum" ] && [ -x /usr/bin/dnf ]; then
684684
rpm_installer=dnf
685685
fi
686-
if rpm -q --quiet k3s-selinux; then
686+
if rpm -q --quiet k3s-selinux; then
687687
# remove k3s-selinux module before upgrade to allow container-selinux to upgrade safely
688688
if check_available_upgrades container-selinux ${3} && check_available_upgrades k3s-selinux ${3}; then
689689
MODULE_PRIORITY=$($SUDO semodule --list=full | grep k3s | cut -f1 -d" ")
@@ -1150,4 +1150,3 @@ eval set -- $(escape "${INSTALL_K3S_EXEC}") $(quote "$@")
11501150
create_service_file
11511151
service_enable_and_start
11521152
}
1153-

install.sh.sha256sum

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
f60c3d8940dfc896f7d83aaf57726c91cf21afc4bca40036472df108d9700b4b install.sh
1+
e0fbc48a74045ae279bde25bf6ac5502b256017d4d648b53750050993d4b71e6 install.sh

0 commit comments

Comments
 (0)