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

Picking mariner from production ring instead of preview #118

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Picking mariner from production ring instead of preview #118

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
35 changes: 9 additions & 26 deletions linux/installation/mde_installer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,30 +563,6 @@ install_on_debian()
log_info "[v] installed"
}

install_on_mariner()
{
local packages=
local pkg_version=
local repo=
local effective_distro=

if check_if_pkg_is_installed mdatp; then
pkg_version=$($MDE_VERSION_CMD) || script_exit "Unable to fetch the app version. Please upgrade to latest version $?" $ERR_INSTALLATION_FAILED
log_info "[i] MDE already installed ($pkg_version)"
return
fi

### Add Preview Repo File ###
tdnf -y install mariner-repos-extras-preview

### Install MDE ###
log_info "[>] installing MDE"
run_quietly "$PKG_MGR_INVOKER install mdatp" "unable to install MDE ($?)" $ERR_INSTALLATION_FAILED

sleep 5
log_info "[v] installed"
}

install_on_fedora()
{
local packages=
Expand Down Expand Up @@ -627,6 +603,8 @@ install_on_fedora()

if [ "$DISTRO" == "ol" ] || [ "$DISTRO" == "fedora" ] || [ "$DISTRO" == "amzn" ] || [ "$DISTRO" == "almalinux" ] || [ "$DISTRO" == "rocky" ]; then
effective_distro="rhel"
elif [ "$DISTRO" == "mariner" ]; then
effective_distro="cbl-mariner"
else
effective_distro="$DISTRO"
fi
Expand All @@ -653,6 +631,11 @@ install_on_fedora()
log_info "[v] installed"
}

install_on_mariner()
{
install_on_fedora
}

install_on_sles()
{
local packages=
Expand Down Expand Up @@ -723,7 +706,7 @@ remove_repo()
fi
run_quietly "$PKG_MGR_INVOKER removerepo $repo_name" "failed to remove repo"

elif [ "$DISTRO_FAMILY" == "fedora" ]; then
elif [ "$DISTRO_FAMILY" == "fedora" ] || [ "$DISTRO_FAMILY" == "mariner" ]; then
local repo=packages-microsoft-com
local repo_name="$repo-$CHANNEL"

Expand Down Expand Up @@ -823,7 +806,7 @@ scale_version_id()
fi
elif [ "$DISTRO_FAMILY" == "mariner" ]; then
if [[ $VERSION == 2* ]]; then
SCALED_VERSION=2
SCALED_VERSION=2.0
else
script_exit "unsupported version: $DISTRO $VERSION" $ERR_UNSUPPORTED_VERSION
fi
Expand Down