From 50a82bf7ba4ba78a84efd17608bc57cfabf350d4 Mon Sep 17 00:00:00 2001
From: ViViDboarder <ViViDboarder@gmail.com>
Date: Tue, 7 Sep 2021 09:03:28 -0700
Subject: [PATCH] Update package installs to install apk packages too

---
 helpers/default          |  2 +-
 recipes/default/packages | 49 +++++++++++++++++++++-------------------
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/helpers/default b/helpers/default
index d5fa580..db113d7 100644
--- a/helpers/default
+++ b/helpers/default
@@ -228,7 +228,7 @@ detect_package_manager () {
     PACKAGE_MANAGER='port'
   elif command_exist brew; then
     PACKAGE_MANAGER='brew'
-  elif command_exists apk; then
+  elif command_exist 'apk'; then
     PACKAGE_MANAGER='apk' 
   else
     error "Could not find a package manager. Fail!"
diff --git a/recipes/default/packages b/recipes/default/packages
index 2daf8f4..d1a2e82 100755
--- a/recipes/default/packages
+++ b/recipes/default/packages
@@ -13,11 +13,12 @@ packages="fish bash"
 # Common shell utils
 packages="$packages tmux htop curl wget pv jq mosh bash-completion ripgrep"
 # Development tools
-packages="$packages neovim vim universal-ctags tig doxygen shellcheck"
+packages="$packages neovim vim tig doxygen shellcheck"
 
 # Manager specific packages
 case "$PACKAGE_MANAGER" in
     "port")
+        packages="$packages universal-ctags"
         # Non-standard packages
         packages="$packages md5sha1sum gradle apache-ant"
         # Python packages
@@ -31,35 +32,37 @@ case "$PACKAGE_MANAGER" in
         packages="$packages git +bash_completion"
         # Neovim python plugins
         packages="$packages py-neovim py27-neovim py39-neovim"
-
-        # Install packages
-        sudo_package "$packages"
-
-        # Select defaults
-        sudo port select --set python python27
-        sudo port select --set python2 python27
-        sudo port select --set python3 python39
-        sudo port select --set ipython py27-ipython
-        sudo port select --set ipython2 py27-ipython
-        sudo port select --set ipython3 py39-ipython
-        sudo port select --set pip pip27
-        sudo port select --set pip2 pip27
-        sudo port select --set pip3 pip39
-        # Use py3 versions for utilities
-        sudo port select --set tox tox39
-        sudo port select --set flake8 flake8-39
-        sudo port select --set black black39
-        sudo port select --set virtualenv virtualenv39
         ;;
     "apt-get")
-        packages="$packages build-essential"
+        packages="$packages universal-ctags build-essential"
         # Neovim python plugins
         packages="$packages python3-neovim"
         # Python packages
         packages="$packages python3 python3-ipython python3-pip python3-six tox python3-flake8 black python3-virtualenv python3-venv"
-
-        sudo_package "$packages"
+        ;;
+    "apk")
+        packages="$packages ctags py3-pynvim"
         ;;
 esac
 
+sudo_package "$packages"
+
+if [[ "$PACKAGE_MANAGER" == "port" ]]; then
+    # Select defaults
+    sudo port select --set python python27
+    sudo port select --set python2 python27
+    sudo port select --set python3 python39
+    sudo port select --set ipython py27-ipython
+    sudo port select --set ipython2 py27-ipython
+    sudo port select --set ipython3 py39-ipython
+    sudo port select --set pip pip27
+    sudo port select --set pip2 pip27
+    sudo port select --set pip3 pip39
+    # Use py3 versions for utilities
+    sudo port select --set tox tox39
+    sudo port select --set flake8 flake8-39
+    sudo port select --set black black39
+    sudo port select --set virtualenv virtualenv39
+fi
+
 pip3 install --user padio