Update fish deps, fix deb install

install/02-fish.sh

@@ -17,7 +17,7 @@ if ! [ -f "$fisher_location" ]; then
     curl https://git.io/fisher --create-dirs -sLo "$fisher_location"
 fi
 echo "fisher is installed, updating..."
-`fish -c "fisher"`;
+fish -c "fisher update";
 
 fish -c "fisher --version"
 
@@ -25,10 +25,12 @@ if not_installed "fishlogin"; then
     echo "setting up fishlogin..."
     mkdir -p ~/bin
     target="$HOME/bin/fishlogin"
+
     tee -a $target << END
 #!/bin/bash
 exec -l fish "\$@"
 END
+
     sudo chmod +x $target
     echo $target | sudo tee -a /etc/shells
     sudo usermod -s $target $USER

install/10-pyenv-pkglist

@@ -1,13 +1,15 @@
-build-essential 
-libssl-dev 
+build-essential
+libssl-dev
 libbz2-dev
 libreadline-dev
+libreadline6
+libreadline6-dev
 libsqlite3-dev
 llvm
 libncurses5-dev
 libncursesw5-dev
-xz-utils 
-tk-dev 
-libffi-dev 
-liblzma-dev 
-python-openssl 
+xz-utils
+tk-dev
+libffi-dev
+liblzma-dev
+zlib1g-dev

install/30-docker.sh

@@ -15,9 +15,10 @@ if not_installed "docker"; then
         software-properties-common
 
     # Add repository
-    add_key "https://download.docker.com/linux/ubuntu/gpg"
+    distro=$(lsb_release -si | tr '[:upper:]' '[:lower:]') # cast to lowercase
+    add_key "https://download.docker.com/linux/$distro/gpg" "docker-apt-key"
     sudo add-apt-repository -y \
-        "deb [arch=amd64] https://download.docker.com/linux/ubuntu \
+        "deb [arch=amd64] https://download.docker.com/linux/$distro \
         $(lsb_release -cs) \
         stable"
     update

install/utils.sh

@@ -39,10 +39,9 @@ add_ppa() {
 }
 
 # @arg $1 url to add
+# @arg $2 keyring to add to
 add_key() {
-    APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=true \
-        curl -fsSL $1 \
-        | sudo apt-key add -
+    curl -fsSL $1 | sudo apt-key --keyring "/etc/apt/trusted.gpg.d/$2.gpg" add
 }
 
 # @arg $1 URL to run