Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

allow install script to handle tags and system extension #96

Merged
merged 1 commit into from
Aug 29, 2024
Merged

allow install script to handle tags and system extension #96

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions Bash/InstallHuntress-macOS-bash.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,14 @@ Usage: $0 [options...] --account_key=<account_key> --organization_key=<organizat

-a, --account_key <account_key> The account key to use for this agent install
-o, --organization_key <organization_key> The org key to use for this agent install
-t, --tags <tags> A comma-separated list of agent tags
-i, --install_system_extension If passed, automatically install the system extension
-h, --help Print this message

EOF
}

while getopts a:o:h:-: OPT; do
while getopts a:o:h:t:-:i OPT; do
if [ "$OPT" = "-" ]; then
OPT="${OPTARG%%=*}" # extract long option name
OPTARG="${OPTARG#$OPT}" # extract long option argument (may be empty)
Expand All @@ -124,6 +126,12 @@ while getopts a:o:h:-: OPT; do
o | organization_key)
organization_key="$OPTARG"
;;
t | tags)
tags="$OPTARG"
;;
i | install_system_extension)
install_system_extension=true
;;
h | help)
usage
;;
Expand Down Expand Up @@ -162,6 +170,14 @@ if ! [[ "$account_key" =~ $pattern ]]; then
accountKey=$(echo "$account_key" | xargs)
fi

if [ -n "$tags" ]; then
logger "using tags: $tags"
fi

if [ "$install_system_extension" = true ]; then
logger "automatically installing system extension"
fi

# Hide most of the account key in the logs, keeping the front and tail end for troubleshooting
masked="$(echo "${accountKey:0:4}")"
masked+="************************"
Expand Down Expand Up @@ -194,9 +210,9 @@ if grep -Fq "$invalid_key" "$install_script"; then
fi

if [ "$install_system_extension" = true ]; then
install_result="$(/bin/bash "$install_script" -a "$accountKey" -o "$organizationKey" -v --install_system_extension)"
install_result="$(/bin/bash "$install_script" -a "$accountKey" -o "$organizationKey" -t "$tags" -v --install_system_extension)"
else
install_result="$(/bin/bash "$install_script" -a "$accountKey" -o "$organizationKey" -v)"
install_result="$(/bin/bash "$install_script" -a "$accountKey" -o "$organizationKey" -t "$tags" -v)"
fi

logger "=============== Begin Installer Logs ==============="
Expand Down
Loading