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

Commit 8f60eff

Browse files
Fix Fish shell installation (#1503)
* Fix Fish shell installation * Echo fish and fisher versions for easier debugging * Enable a regression test for fish back
1 parent 2ca3c27 commit 8f60eff

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

script-library/fish-debian.sh

+6-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ echo "Installing fish shell..."
6565
if grep -q 'Ubuntu' < /etc/os-release; then
6666
check_packages software-properties-common
6767
apt-add-repository -y ppa:fish-shell/release-3
68-
check_packages fish
68+
apt-get update
69+
apt-get -y install --no-install-recommends fish
6970
elif grep -q 'Debian' < /etc/os-release; then
7071
if grep -q 'stretch' < /etc/os-release; then
7172
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
@@ -77,8 +78,10 @@ elif grep -q 'Debian' < /etc/os-release; then
7778
echo 'deb http://download.opensuse.org/repositories/shells:/fish:/release:/3/Debian_11/ /' | tee /etc/apt/sources.list.d/shells:fish:release:3.list
7879
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
7980
fi
80-
check_packages fish
81+
apt-get update
82+
apt-get -y install --no-install-recommends fish
8183
fi
84+
fish -v
8285

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

9296
echo "Done!"

script-library/test/regression/run-scripts.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ if [ "${DISTRO}" = "debian" ]; then
109109
run_script python "3.10 /opt/python /opt/python-tools ${USERNAME} false false"
110110
run_script awscli
111111
run_script azcli
112-
# run_script fish "false ${USERNAME}"
112+
run_script fish "false ${USERNAME}"
113113
run_script git-from-src "latest true"
114114
run_script git-lfs "" "2.13.3"
115115
run_script github

0 commit comments

Comments
 (0)