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

fix ioctl update failed on mac #3957

Merged
merged 6 commits into from
Nov 23, 2023
Merged

fix ioctl update failed on mac #3957

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7b19783
fix ioctl update failed on mac
millken Nov 1, 2023
619596f
Merge branch 'master' into issue3955
millken Nov 1, 2023
d0836f8
Update install-cli.sh
millken Nov 15, 2023
26f6714
Merge branch 'master' into issue3955
millken Nov 20, 2023
4fd2dbc
Merge branch 'master' into issue3955
millken Nov 23, 2023
e0c0d8f
Merge branch 'master' into issue3955
millken Nov 23, 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
11 changes: 2 additions & 9 deletions install-cli.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ BREW_UPDATE_CMD="brew update"
BREW_INSTALL_CMD="brew install ioctl"
BREW_REINSTALL_CMD="brew reinstall ioctl"
BREW_UNSTABLE_TAP_CMD="brew tap iotexproject/ioctl-unstable"
BREW_UNSTABLE_INSTALL_CMD="brew install --HEAD iotexproject/ioctl-unstable/ioctl-unstable"
BREW_UNSTABLE_INSTALL_CMD="brew install iotexproject/ioctl-unstable/ioctl-unstable"
BREW_UNSTABLE_REINSTALL_CMD="brew reinstall ioctl-unstable"
BREW_INSTALLED_PATH="/usr/local/bin"

Expand Down Expand Up @@ -122,27 +122,20 @@ else
fi

if [ "${OS}" = "darwin" ];then
if test -x "$(command -v brew)"; then
if test -x "$(command -v brew)"; then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove space?

if [ "$1" = "unstable" ]; then
if [ `command -v ioctl` ]; then
rm -f $BREW_INSTALLED_PATH/ioctl
fi

if [ `command -v ioctl-unstable` ]; then
$BREW_UNSTABLE_REINSTALL_CMD
else
$BREW_UNSTABLE_TAP_CMD && $BREW_UNSTABLE_INSTALL_CMD
fi
ln -s $BREW_INSTALLED_PATH/ioctl-unstable $BREW_INSTALLED_PATH/ioctl
echo "Command-line tools is installed to `command -v ioctl-unstable`"
else
if [ `command -v ioctl` ]; then
rm -f $BREW_INSTALLED_PATH/ioctl
$BREW_UPDATE_CMD && $BREW_REINSTALL_CMD
else
$BREW_UPDATE_CMD && $BREW_INSTALL_CMD
fi

echo "Command-line tools is installed to `command -v ioctl`"
fi
exit 0
Expand Down