From 7c24ca0c1a77d34cd7fe420a417d00fc54914eec Mon Sep 17 00:00:00 2001
From: Marcel Bischoff <marcel@herrbischoff.com>
Date: Wed, 3 Mar 2021 11:53:03 +0100
Subject: [PATCH] Update FreeBSD instructions

---
 .config/fish/functions/update.fish | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/.config/fish/functions/update.fish b/.config/fish/functions/update.fish
index fc0ec6b..45b05de 100644
--- a/.config/fish/functions/update.fish
+++ b/.config/fish/functions/update.fish
@@ -4,43 +4,44 @@
 
 function __freebsd_pkg
 	printf "\n====[ Upgrade Software ] ===================================\n"; and \
-	sudo pkg update; and \
-	sudo pkg upgrade
+	doas pkg update && \
+	doas pkg upgrade
 end
 
 function __freebsd_portmaster
 	printf "\n====[ Upgrade Software ] ===================================\n"; and \
-        sudo portmaster -aBdt --packages-build && \
-	sudo portmaster -y --clean-distfiles
+        doas portmaster -aBdt --packages-build && \
+        doas portmaster -y --clean-distfiles
 end
 
 function __freebsd_synth
 	printf "\n====[ Compile and Upgrade Software ]========================\n"; and \
-	sudo synth upgrade-system
+	doas synth upgrade-system
 end
 
 function __freebsd_portsnap
-    printf "\n====[ Update Ports tree ]===================================\n"; and \
-    sudo portsnap fetch update
+    if test -d /usr/ports
+        printf "\n====[ Update Ports tree ]===================================\n"; and \
+        doas portsnap fetch update
+    end
 end
 
 function __freebsd_ezjail_ports
     set cmd (which ezjail-admin)
     if test $status -eq 0
         printf "\n====[ Update ezjail Ports tree ]============================\n"; and \
-        sudo ezjail-admin update -P
+        doas ezjail-admin update -P
     end
 end
 
 function __freebsd_freebsd-update
 	printf "====[ System Software Update ]==============================\n"; and \
-	sudo freebsd-update fetch; and \
-	sudo freebsd-update install
+	doas freebsd-update fetch install
 end
 
 function __freebsd_source
 	printf "====[ Update System Sources ]===============================\n"; and \
-	sudo svnlite update /usr/src
+	doas svnlite update /usr/src
 end
 
 function __update_node_packages