Skip to content

Commit d8dcdc9

Browse files
committed
Merge branch 'master' into releases/1.6.x
2 parents 698ddf0 + 037bac8 commit d8dcdc9

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

Diff for: wizard.sh

+2-6
Original file line numberDiff line numberDiff line change
@@ -254,26 +254,22 @@ install_collection() {
254254
fi
255255
done
256256

257-
local YES=""
258-
259257
if [[ ${SILENT} == "false" ]]; then
260258
COLLECTION_TO_INSTALL=($(whiptail --separate-output --ok-button Continue --title "Crowdsec collections" --checklist "Available collections in crowdsec, try to pick one that fits your profile. Collections contains parsers and scenarios to protect your system." 20 120 10 "${HMENU[@]}" 3>&1 1>&2 2>&3))
261259
if [ $? -eq 1 ]; then
262260
log_err "user bailed out at collection selection"
263261
exit 1;
264262
fi;
265-
else
266-
YES="--yes"
267263
fi;
268264

269265
for collection in "${COLLECTION_TO_INSTALL[@]}"; do
270266
log_info "Installing collection '${collection}'"
271267
# shellcheck disable=SC2248
272-
${CSCLI_BIN_INSTALLED} collections install "${collection}" --error ${YES}
268+
${CSCLI_BIN_INSTALLED} collections install "${collection}" --error
273269
done
274270

275271
# shellcheck disable=SC2248
276-
${CSCLI_BIN_INSTALLED} parsers install "crowdsecurity/whitelists" --error ${YES}
272+
${CSCLI_BIN_INSTALLED} parsers install "crowdsecurity/whitelists" --error
277273
if [[ ${SILENT} == "false" ]]; then
278274
whiptail --msgbox "Out of safety, I installed a parser called 'crowdsecurity/whitelists'. This one will prevent private IP addresses from being banned, feel free to remove it any time." 20 50
279275
fi

0 commit comments

Comments
 (0)