Skip to content

Commit ad55554

Browse files
authored
Merge pull request dotnet#91 from AR-May/update-pre-reqs-in-warnings
Removing dependencies check, adding a link to documentation page
2 parents bfa8953 + 2e43198 commit ad55554

File tree

2 files changed

+4
-37
lines changed

2 files changed

+4
-37
lines changed

src/dotnet-install.ps1

+2
Original file line numberDiff line numberDiff line change
@@ -773,5 +773,7 @@ Remove-Item $ZipPath
773773

774774
Prepend-Sdk-InstallRoot-To-Path -InstallRoot $InstallRoot -BinFolderRelativePath $BinFolderRelativePath
775775

776+
Say "Please note that the script does not resolve dependencies during installation."
777+
Say "To check the list of dependencies, go to https://docs.microsoft.com/en-us/dotnet/core/install/windows#dependencies"
776778
Say "Installation finished"
777779
exit 0

src/dotnet-install.sh

+2-37
Original file line numberDiff line numberDiff line change
@@ -241,42 +241,6 @@ check_min_reqs() {
241241
return 0
242242
}
243243

244-
check_pre_reqs() {
245-
eval $invocation
246-
247-
if [ "${DOTNET_INSTALL_SKIP_PREREQS:-}" = "1" ]; then
248-
return 0
249-
fi
250-
251-
if [ "$(uname)" = "Linux" ]; then
252-
if is_musl_based_distro; then
253-
if ! command -v scanelf > /dev/null; then
254-
say_warning "scanelf not found, please install pax-utils package."
255-
return 0
256-
fi
257-
LDCONFIG_COMMAND="scanelf --ldpath -BF '%f'"
258-
[ -z "$($LDCONFIG_COMMAND 2>/dev/null | grep libintl)" ] && say_warning "Unable to locate libintl. Probable prerequisite missing; install libintl (or gettext)."
259-
else
260-
if [ ! -x "$(command -v ldconfig)" ]; then
261-
say_verbose "ldconfig is not in PATH, trying /sbin/ldconfig."
262-
LDCONFIG_COMMAND="/sbin/ldconfig"
263-
else
264-
LDCONFIG_COMMAND="ldconfig"
265-
fi
266-
local librarypath=${LD_LIBRARY_PATH:-}
267-
LDCONFIG_COMMAND="$LDCONFIG_COMMAND -NXv ${librarypath//:/ }"
268-
fi
269-
270-
[ -z "$($LDCONFIG_COMMAND 2>/dev/null | grep zlib)" ] && say_warning "Unable to locate zlib. Probable prerequisite missing; install zlib."
271-
[ -z "$($LDCONFIG_COMMAND 2>/dev/null | grep ssl)" ] && say_warning "Unable to locate libssl. Probable prerequisite missing; install libssl."
272-
[ -z "$($LDCONFIG_COMMAND 2>/dev/null | grep libicu)" ] && say_warning "Unable to locate libicu. Probable prerequisite missing; install libicu."
273-
[ -z "$($LDCONFIG_COMMAND 2>/dev/null | grep lttng)" ] && say_warning "Unable to locate liblttng. Probable prerequisite missing; install liblttng."
274-
[ -z "$($LDCONFIG_COMMAND 2>/dev/null | grep libcurl)" ] && say_warning "Unable to locate libcurl. Probable prerequisite missing; install libcurl."
275-
fi
276-
277-
return 0
278-
}
279-
280244
# args:
281245
# input - $1
282246
to_lowercase() {
@@ -1118,7 +1082,6 @@ if [ "$dry_run" = true ]; then
11181082
exit 0
11191083
fi
11201084
1121-
check_pre_reqs
11221085
install_dotnet
11231086
11241087
bin_path="$(get_absolute_path "$(combine_paths "$install_root" "$bin_folder_relative_path")")"
@@ -1129,4 +1092,6 @@ else
11291092
say "Binaries of dotnet can be found in $bin_path"
11301093
fi
11311094
1095+
say "Please note that the script does not resolve dependencies during installation."
1096+
say "To check the list of dependencies, go to https://docs.microsoft.com/en-us/dotnet/core/install, select your operating system and check the \"Dependencies\" section."
11321097
say "Installation finished successfully."

0 commit comments

Comments
 (0)