Skip to content

feat: Allow installation without sudo if possible #810

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

Merged
sasa-tomic merged 5 commits into from
Jul 13, 2020
Merged

feat: Allow installation without sudo if possible #810

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ad1f9b8
feat: Allow installation without sudo if possible
sasa-tomic Jul 13, 2020
ade1386
Made linter happy
sasa-tomic Jul 13, 2020
abdd7af
Linter fix
sasa-tomic Jul 13, 2020
5df67f7
Linter fix
sasa-tomic Jul 13, 2020
3e89796
Merge branch 'master' into sat/skip-sudo-when-unnecessary
sasa-tomic Jul 13, 2020
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
25 changes: 21 additions & 4 deletions public/install/999_footer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,16 @@ validate_install_dir() {
local dir="${1%/}"

# We test it's a directory and writeable.

# Try to create the directory if it doesn't exist already
if ! [ -d "$dir" ]; then
if ! mkdir -p "$dir"; then
if type sudo >/dev/null; then
sudo mkdir -p "$dir"
fi
fi
fi

! [ -d "$dir" ] && return 1
! [ -w "$dir" ] && return 2

Expand All @@ -51,6 +61,7 @@ validate_install_dir() {
sdk_install_dir() {
if [ "${DFX_INSTALL_ROOT:-}" ]; then
# If user specifies an actual dir, use that.
validate_install_dir "${DFX_INSTALL_ROOT}"
printf %s "${DFX_INSTALL_ROOT}"
elif validate_install_dir /usr/local/bin; then
printf %s /usr/local/bin
Expand All @@ -59,7 +70,7 @@ sdk_install_dir() {
# user is missing a /usr/local/bin we need to create it. Even if it is
# not "writeable" we expect the user to have access to super user
# privileges during the installation.
mkdir -p /usr/local/bin 2>/dev/null || sudo mkdir -p /usr/local/bin || true
validate_install_dir /usr/local/bin
printf %s /usr/local/bin
elif validate_install_dir /usr/bin; then
printf %s /usr/bin
Expand Down Expand Up @@ -95,8 +106,6 @@ main() {
need_cmd tar
need_cmd gzip
need_cmd touch
# For instance in Debian sudo can be missing.
need_cmd sudo

if ! confirm_license; then
echo "Please accept the license to continue."
Expand Down Expand Up @@ -139,7 +148,15 @@ main() {
printf "%s\n" "Will install in: ${_install_dir}"
mkdir -p "${_install_dir}" || true

mv "$_dfx_file" "${_install_dir}" 2>/dev/null || sudo mv "$_dfx_file" "${_install_dir}" \
if [ -w "${_install_dir}" ]; then
MV=mv
else
if ! type sudo >/dev/null; then
err "Install directory '${_install_dir}' not writable and sudo command not found"
fi
MV="sudo mv"
fi
$MV "$_dfx_file" "${_install_dir}" 2>/dev/null \
|| err "Failed to install the DFINITY Development Kit: please check your permissions and try again."

log "Installed $_install_dir/dfx"
Expand Down