Skip to content

Fix mariner sudo detection #19304

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
TravisEz13 merged 5 commits into from
Mar 13, 2023
Merged

Fix mariner sudo detection #19304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
54efe2d
Change the permissions on the symlink created for mariner
TravisEz13 Mar 9, 2023
9ee7ab1
Update installpsh-mariner.sh
TravisEz13 Mar 9, 2023
df1767a
Update install-ps.yml
TravisEz13 Mar 9, 2023
11c3c4f
Update linux.yml
TravisEz13 Mar 9, 2023
03bc306
Update installpsh-mariner.sh
TravisEz13 Mar 9, 2023
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
15 changes: 3 additions & 12 deletions .vsts-ci/install-ps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,8 @@ trigger:
- feature*
paths:
include:
- /tools/install-powershell.sh
- /tools/installpsh-amazonlinux.sh
- /tools/installpsh-debian.sh
- /tools/installpsh-osx.sh
- /tools/installpsh-redhat.sh
- /tools/installpsh-suse.sh
- /tools/install-powershell.ps1
- /tools/install-powershell.*
- /tools/installpsh-*.sh
- /.vsts-ci/install-ps.yml
pr:
branches:
Expand All @@ -26,11 +21,7 @@ pr:
paths:
include:
- /tools/install-powershell.sh
- /tools/installpsh-amazonlinux.sh
- /tools/installpsh-debian.sh
- /tools/installpsh-osx.sh
- /tools/installpsh-redhat.sh
- /tools/installpsh-suse.sh
- /tools/installpsh-*.sh
- /tools/install-powershell.ps1
- /.vsts-ci/install-ps.yml

Expand Down
1 change: 1 addition & 0 deletions .vsts-ci/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ pr:
- test/common/markdown/*
- test/perf/*
- tools/releaseBuild/*
- tools/install*
- tools/releaseBuild/azureDevOps/templates/*
- README.md
- .spelling
Expand Down
10 changes: 5 additions & 5 deletions tools/installpsh-mariner.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ gitreposubpath="PowerShell/PowerShell/master"
gitreposcriptroot="https://raw.githubusercontent.com/$gitreposubpath/tools"
thisinstallerdistro=mariner
repobased=false
gitscriptname="installpsh-mariner.psh"
gitscriptname="installpsh-mariner.sh"
pwshlink=/usr/bin/pwsh

echo
Expand Down Expand Up @@ -109,11 +109,11 @@ fi
SUDO=''
if (( EUID != 0 )); then
#Check that sudo is available
if [[ ("'$*'" =~ skip-sudo-check) && ("$(whereis sudo)" == *'/'* && "$(sudo -nv 2>&1)" != 'Sorry, user'*) ]]; then
if [[ ("'$*'" =~ skip-sudo-check) || ("$(whereis sudo)" == *'/'* && "$(sudo -nv 2>&1)" != 'Sorry, user'*) ]]; then
SUDO='sudo'
else
echo "ERROR: You must either be root or be able to use sudo" >&2
#exit 5
exit 5
fi
fi

Expand All @@ -139,8 +139,8 @@ $SUDO tdnf install -y \
openssh-clients \
ca-certificates \
tar \
curl \
&& tdnf clean all
curl
$SUDO tdnf clean all

##END Check requirements and prerequisites

Expand Down