From a04ee34f4b50c1b7947ef7521e7f43874c1d6610 Mon Sep 17 00:00:00 2001
From: Brian Zalewski <brian@megabyte.space>
Date: Tue, 6 Dec 2022 18:01:08 +0000
Subject: [PATCH] Update
 .local/share/chezmoi/home/dot_local/bin/executable_task,
 .local/share/chezmoi/home/dot_local/Taskfile-local.yml,
 .local/share/chezmoi/home/dot_local/bin/executable_install-program,
 .local/share/chezmoi/home/private_dot_config/shell/exports.sh.tmpl Deleted
 .local/share/chezmoi/home/dot_local/bin/executable_run

---
 .../share/chezmoi/home/dot_local/Taskfile-local.yml   |  4 ++--
 .../home/dot_local/bin/executable_install-program     |  6 +++---
 .../share/chezmoi/home/dot_local/bin/executable_run   |  3 ---
 .../share/chezmoi/home/dot_local/bin/executable_task  | 11 +++++++++++
 .../home/private_dot_config/shell/exports.sh.tmpl     |  1 +
 5 files changed, 17 insertions(+), 8 deletions(-)
 delete mode 100644 .local/share/chezmoi/home/dot_local/bin/executable_run
 create mode 100644 .local/share/chezmoi/home/dot_local/bin/executable_task

diff --git a/.local/share/chezmoi/home/dot_local/Taskfile-local.yml b/.local/share/chezmoi/home/dot_local/Taskfile-local.yml
index ec7fd780..1e3fee80 100644
--- a/.local/share/chezmoi/home/dot_local/Taskfile-local.yml
+++ b/.local/share/chezmoi/home/dot_local/Taskfile-local.yml
@@ -4,8 +4,8 @@ version: '3'
 # This is your local Taskfile.yml file. You can define tasks and scripts while leveraging some of the nifty
 # features of https://taskfile.dev. You can safely place your scripts here and they will be combined with
 # a veteran stack of Taskfile.yml files. You can access the tasks defined here by running
-# `run local:default` for example. You must keep all the tasks in this file without including other files
-# because the main Taskfile.yml is a symlinked one. Anyway, try `run local:default`.
+# `task local:default` for example. You must keep all the tasks in this file without including other files
+# because the main Taskfile.yml is a symlinked one. Anyway, try `task local:default`.
 tasks:
   default: echo "Get started on https://taskfile.dev"
   bitwarden:
diff --git a/.local/share/chezmoi/home/dot_local/bin/executable_install-program b/.local/share/chezmoi/home/dot_local/bin/executable_install-program
index 9da725b6..f232d10a 100644
--- a/.local/share/chezmoi/home/dot_local/bin/executable_install-program
+++ b/.local/share/chezmoi/home/dot_local/bin/executable_install-program
@@ -887,9 +887,9 @@ async function ensurePackageManager(packageManager) {
           cd macports-base
           sudo git checkout v2.8.0
           sudo ./configure --enable-readline
-          sudo make
-          sudo make install
-          sudo make distclean
+          sudo bash --noprofile --norc -c 'make && make install && make distclean'
+          sudo bash --noprofile --norc -c 'make install'
+          sudo bash --noprofile --norc -c 'make distclean'
         `
       );
       log('info', logStage, `${packageManager} is now installed`)
diff --git a/.local/share/chezmoi/home/dot_local/bin/executable_run b/.local/share/chezmoi/home/dot_local/bin/executable_run
deleted file mode 100644
index 287a41db..00000000
--- a/.local/share/chezmoi/home/dot_local/bin/executable_run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-task --taskfile $HOME/.local/src/shared-common/common/Taskfile.yml $@
diff --git a/.local/share/chezmoi/home/dot_local/bin/executable_task b/.local/share/chezmoi/home/dot_local/bin/executable_task
new file mode 100644
index 00000000..9afd16f6
--- /dev/null
+++ b/.local/share/chezmoi/home/dot_local/bin/executable_task
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+if command -v task > /dev/null; then
+  if [ -f Taskfile.yml ]; then
+    task $@
+  else
+    task --taskfile "$HOME/.local/src/shared-common/common/Taskfile.yml" $@
+  fi
+else
+  echo 'task is not installed.' && exit 1
+fi
diff --git a/.local/share/chezmoi/home/private_dot_config/shell/exports.sh.tmpl b/.local/share/chezmoi/home/private_dot_config/shell/exports.sh.tmpl
index 6a509122..87fa3656 100644
--- a/.local/share/chezmoi/home/private_dot_config/shell/exports.sh.tmpl
+++ b/.local/share/chezmoi/home/private_dot_config/shell/exports.sh.tmpl
@@ -34,6 +34,7 @@ export GTK_RC_FILES="$XDG_CONFIG_HOME/gtk-1.0/gtkrc"
 export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/gtkrc"
 
 ### PATH
+export PATH="/opt/local/bin:$PATH"
 export PATH="$HOME/.local/bin:$PATH"
 export PATH="$HOME/.local/bin/docker:$PATH"
 export PATH="$HOME/.local/bin/firejail:$PATH"