Merge pull request #5820 from kit-ty-kate/install-script-doas

shell/install.sh: Add support for doas as an alternative to sudo
ocaml · Feb 5, 2024 · da38263 · da38263
2 parents 976455a + a3b5ef0
commit da38263
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/master_changes.md b/master_changes.md
@@ -76,6 +76,9 @@ users)
 
 ## Release scripts
 
+## Install script
+  * Add support for doas as an alternative to sudo [#5820 @kit-ty-kate - fix #5792]
+
 ## Admin
 
 ## Opam installer

diff --git a/shell/install.sh b/shell/install.sh
@@ -390,12 +390,21 @@ xsudo() {
 
     local DSTDIR=$(dirname "$DST")
     if [ ! -w "$DSTDIR" ]; then
-        echo "Write access to $DSTDIR required, using 'sudo'."
+        if command -v sudo > /dev/null ; then
+            SUDO=sudo
+        elif command -v doas > /dev/null ; then
+            SUDO=doas
+        else
+            echo "Write access to '$DSTDIR' required, but neither sudo or doas is installed."
+            echo "Aborting..."
+            exit 1
+        fi
+        echo "Write access to '$DSTDIR' required, using '$SUDO'."
         echo "Command: $CMD $@"
         if [ "$CMD" = "install" ]; then
-            sudo "$CMD" -g 0 -o root "$@"
+            "$SUDO" "$CMD" -g 0 -o root "$@"
         else
-            sudo "$CMD" "$@"
+            "$SUDO" "$CMD" "$@"
         fi
     else
         "$CMD" "$@"