Skip to content
This repository has been archived by the owner on Nov 30, 2023. It is now read-only.

Commit

Permalink
Fix Fish shell installation (#1503)
Browse files Browse the repository at this point in the history
* Fix Fish shell installation

* Echo fish and fisher versions for easier debugging

* Enable a regression test for fish back
  • Loading branch information
andreiborisov authored Jun 21, 2022
1 parent 2ca3c27 commit 8f60eff
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
8 changes: 6 additions & 2 deletions script-library/fish-debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ echo "Installing fish shell..."
if grep -q 'Ubuntu' < /etc/os-release; then
check_packages software-properties-common
apt-add-repository -y ppa:fish-shell/release-3
check_packages fish
apt-get update
apt-get -y install --no-install-recommends fish
elif grep -q 'Debian' < /etc/os-release; then
if grep -q 'stretch' < /etc/os-release; then
echo 'deb http://download.opensuse.org/repositories/shells:/fish:/release:/3/Debian_9.0/ /' | tee /etc/apt/sources.list.d/shells:fish:release:3.list
Expand All @@ -77,8 +78,10 @@ elif grep -q 'Debian' < /etc/os-release; then
echo 'deb http://download.opensuse.org/repositories/shells:/fish:/release:/3/Debian_11/ /' | tee /etc/apt/sources.list.d/shells:fish:release:3.list
curl -fsSL https://download.opensuse.org/repositories/shells:fish:release:3/Debian_11/Release.key | gpg --dearmor | tee /etc/apt/trusted.gpg.d/shells_fish_release_3.gpg > /dev/null
fi
check_packages fish
apt-get update
apt-get -y install --no-install-recommends fish
fi
fish -v

# Install Fisher
if [ "${INSTALL_FISHER}" = "true" ]; then
Expand All @@ -87,6 +90,7 @@ if [ "${INSTALL_FISHER}" = "true" ]; then
if [ "${USERNAME}" != "root" ]; then
sudo -u $USERNAME fish -c 'curl -sL https://raw.githubusercontent.com/jorgebucaran/fisher/main/functions/fisher.fish | source && fisher install jorgebucaran/fisher'
fi
fish -c "fisher -v"
fi

echo "Done!"
2 changes: 1 addition & 1 deletion script-library/test/regression/run-scripts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ if [ "${DISTRO}" = "debian" ]; then
run_script python "3.10 /opt/python /opt/python-tools ${USERNAME} false false"
run_script awscli
run_script azcli
# run_script fish "false ${USERNAME}"
run_script fish "false ${USERNAME}"
run_script git-from-src "latest true"
run_script git-lfs "" "2.13.3"
run_script github
Expand Down

0 comments on commit 8f60eff

Please sign in to comment.