Fix fish installation script (#1409)

* use release 3

* use check_packages function

* enable fish installation test

Author: eitsupi

script-library/container-features/test-features.env

@@ -50,5 +50,5 @@ _VSC_INSTALL_DESKTOP_LITE=true
 _VSC_INSTALL_DOTNET=true
 _BUILD_ARG_DOTNET_VERSION=latest
 _BUILD_ARG_DOTNET_RUNTIMEONLY=false
-#_VSC_INSTALL_FISH=true
+_VSC_INSTALL_FISH=true
 _VSC_INSTALL_AWS_CLI=true

script-library/fish-debian.sh

@@ -63,25 +63,21 @@ check_packages curl ca-certificates gnupg2 apt-transport-https
 # Install fish shell
 echo "Installing fish shell..."
 if grep -q 'Ubuntu' < /etc/os-release; then
-    apt-get -y install --no-install-recommends software-properties-common
+    check_packages software-properties-common
     apt-add-repository -y ppa:fish-shell/release-3
-    apt-get update
-    apt-get -y install --no-install-recommends fish
-    apt-get autoremove -y
+    check_packages 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/Debian_9.0/ /' | tee /etc/apt/sources.list.d/shells:fish.list
-        curl -fsSL https://download.opensuse.org/repositories/shells:fish/Debian_9.0/Release.key | gpg --dearmor | tee /etc/apt/trusted.gpg.d/shells_fish.gpg > /dev/null
+        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
+        curl -fsSL https://download.opensuse.org/repositories/shells:fish:release:3/Debian_9.0/Release.key | gpg --dearmor | tee /etc/apt/trusted.gpg.d/shells_fish_release_3.gpg > /dev/null
     elif grep -q 'buster' < /etc/os-release; then
-        echo 'deb http://download.opensuse.org/repositories/shells:/fish/Debian_10/ /' | tee /etc/apt/sources.list.d/shells:fish.list
-        curl -fsSL https://download.opensuse.org/repositories/shells:fish/Debian_10/Release.key | gpg --dearmor | tee /etc/apt/trusted.gpg.d/shells_fish.gpg > /dev/null
+        echo 'deb http://download.opensuse.org/repositories/shells:/fish:/release:/3/Debian_10/ /' | tee /etc/apt/sources.list.d/shells:fish:release:3.list
+        curl -fsSL https://download.opensuse.org/repositories/shells:fish:release:3/Debian_10/Release.key | gpg --dearmor | tee /etc/apt/trusted.gpg.d/shells_fish_release_3.gpg > /dev/null
     elif grep -q 'bullseye' < /etc/os-release; then
-        echo 'deb http://download.opensuse.org/repositories/shells:/fish/Debian_11/ /' | tee /etc/apt/sources.list.d/shells:fish.list
-        curl -fsSL https://download.opensuse.org/repositories/shells:fish/Debian_11/Release.key | gpg --dearmor | tee /etc/apt/trusted.gpg.d/shells_fish.gpg > /dev/null
+        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
-    apt update
-    apt install -y fish
-    apt autoremove -y
+    check_packages fish
 fi
 
 # Install Fisher

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

@@ -81,7 +81,7 @@ fi
 if [ "${DISTRO}" = "debian" ]; then
     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