myriation/atuin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: resolve some issues with install.sh (#188)

Browse source 
* feat: add command checks to install script

Some people don't use sudo or have curl, sed or wget installed by default.
This adds a check, if sudo, curl and sed are installed and changes wget
to curl as this is the mostly used command in the script. If sudo is not
installed it uses su.

Closes: #175

* fix: add newline to printf commands

The printf was missing a newline at the end, which resulted in the eval
line being appended directly to the end of the previous line.
This commit is contained in:
Jannik 2021-12-09 00:21:41 +01:00 committed by GitHub
parent 4bdf4c40c2
commit c8f60b2480
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
install.sh
View file

@ -22,6 +22,14 @@ Please file an issue if you encounter any problems!
EOF EOF
if ! command -v curl &> /dev/null; then
echo "curl not installed. Please install curl."
exit
elif ! command -v sed &> /dev/null; then
echo "sed not installed. Please install sed."
exit
fi
LATEST_RELEASE=$(curl -L -s -H 'Accept: application/json' https://github.com/ellie/atuin/releases/latest) LATEST_RELEASE=$(curl -L -s -H 'Accept: application/json' https://github.com/ellie/atuin/releases/latest)
# Allow sed; sometimes it's more readable than ${variable//search/replace} # Allow sed; sometimes it's more readable than ${variable//search/replace}
# shellcheck disable=SC2001 # shellcheck disable=SC2001
@ -55,8 +63,12 @@ __atuin_install_ubuntu(){
ARTIFACT_URL="https://github.com/ellie/atuin/releases/download/$LATEST_VERSION/atuin_${LATEST_VERSION//v/}_amd64.deb" ARTIFACT_URL="https://github.com/ellie/atuin/releases/download/$LATEST_VERSION/atuin_${LATEST_VERSION//v/}_amd64.deb"
TEMP_DEB="$(mktemp)" && TEMP_DEB="$(mktemp)" &&
wget -O "$TEMP_DEB" "$ARTIFACT_URL" curl -Lo "$TEMP_DEB" "$ARTIFACT_URL"
if command -v sudo &> /dev/null; then
sudo dpkg -i "$TEMP_DEB" sudo dpkg -i "$TEMP_DEB"
else
su -l -c "dpkg -i '$TEMP_DEB'"
fi
rm -f "$TEMP_DEB" rm -f "$TEMP_DEB"
} }
@ -150,10 +162,10 @@ esac
# TODO: Check which shell is in use # TODO: Check which shell is in use
# Use of single quotes around $() is intentional here # Use of single quotes around $() is intentional here
# shellcheck disable=SC2016 # shellcheck disable=SC2016
printf '\neval "$(atuin init zsh)"' >> ~/.zshrc printf '\neval "$(atuin init zsh)"\n' >> ~/.zshrc
curl https://raw.githubusercontent.com/rcaloras/bash-preexec/master/bash-preexec.sh -o ~/.bash-preexec.sh curl https://raw.githubusercontent.com/rcaloras/bash-preexec/master/bash-preexec.sh -o ~/.bash-preexec.sh
printf '\n[[ -f ~/.bash-preexec.sh ]] && source ~/.bash-preexec.sh' >> ~/.bashrc printf '\n[[ -f ~/.bash-preexec.sh ]] && source ~/.bash-preexec.sh\n' >> ~/.bashrc
# Use of single quotes around $() is intentional here # Use of single quotes around $() is intentional here
# shellcheck disable=SC2016 # shellcheck disable=SC2016
echo 'eval "$(atuin init bash)"' >> ~/.bashrc echo 'eval "$(atuin init bash)"' >> ~/.bashrc