Separate commands into libexec/portzap/commands/

bin/portzap

@@ -1,101 +1,24 @@
 #!/bin/sh
 
+# Variables
 ports_url="https://git.hardenedbsd.org/hardenedbsd/ports.git"
 ports_dir="/usr/ports/"
-portzap_rev="$ports_dir/.portzap_last_rev"
+portzap_file="$ports_dir/.portzap"
 portzap_dir="/home/_portzap/ports"
 libexec_dir=$(realpath $(dirname $0)/../libexec/portzap/)
 
+# Masks
 init_mask=707
 clone_mask=007
 pull_mask=007
 
-. $libexec_dir/functions/perms.sh
-
-exit_on_missing_deps() {
-    deps=$1
-    for dep in $deps; do
-        which -s $dep
-        if [ $? -ne 0 ]; then
-            echo $dep is missing
-            exit 1
-        fi
-    done
-}
-
-##
 # Commands
-help() {
+. $libexec_dir/commands/install
-    echo "Usage: portzap clone|pull|install"
+. $libexec_dir/commands/pull
-}
+. $libexec_dir/commands/clone
 
-clone() {
+# Functions
-    if has_portzap_access; then
+. $libexec_dir/functions/requirements.sh
-        if [ -e "$portzap_dir/.git" ]; then
-            echo "$portzap_dir has already been cloned."
-            echo "Run 'portzap pull' instead."
-            exit 1
-        fi
-        umask $clone_mask
-        git clone $ports_url $portzap_dir
-    else
-        echo "Permission denied."
-    fi
-}
-
-pull() {
-    if has_portzap_access; then
-        if [ -e "$portzap_dir/.git" ]; then
-            umask $pull_mask
-            cd $portzap_dir
-            git pull --rebase origin hardenedbsd/main
-        else
-            echo "Run 'portzap clone' first."
-            exit 1
-        fi
-    else
-        echo "Permission denied."
-        exit 1
-    fi
-}
-
-install() {
-    if user_is_not_root; then
-        echo "The install command should be run as root."
-        exit 1
-    fi
-
-    cd $portzap_dir
-    if [ -e "$portzap_rev" ]; then
-        rev=$(cat $portzap_rev)
-        nw_files=$(git diff --name-only --diff-filter=AM $rev..HEAD | cut -d / -f1 -f2 | uniq)
-        rm_files=$(git diff --name-only --diff-filter=D $rev..HEAD)
-        for file in $rm_files; do
-            echo RM $ports_dir/$file
-            rm $ports_dir/$file
-        done
-        for file in $nw_files; do
-            if [ -f "$file" ]; then
-                echo $file
-                $libexec_dir/install-file $ports_dir $file
-            else
-                dir=$file
-                $libexec_dir/install-directory $ports_dir $libexec_dir $dir
-            fi
-        done
-    else
-        find -s . -maxdepth 1 -type f \
-            \( -not -name ".gitignore" \) \
-            \( -not -name ".arcconfig" \) \
-            -exec $libexec_dir/install-file $ports_dir {} +
-        find -s . -maxdepth 1 -type d \
-            \( -not -name "." \) \
-            \( -not -name ".git" \) \
-            \( -not -name ".hooks" \) \
-            -exec $libexec_dir/install-directory $ports_dir $libexec_dir {} +
-    fi
-    echo $(git rev-parse HEAD) > $portzap_rev
-}
 
 case $1 in
     "init")
@@ -103,21 +26,25 @@ case $1 in
         break
         ;;
     "clone")
-        exit_on_missing_deps "git"
+        require_deps git
-        clone
+        require_group _portzap
+        clone $portzap_dir $ports_url $clone_mask
         break
         ;;
     "pull")
-        exit_on_missing_deps "git"
+        require_deps git
-        pull
+        require_group _portzap
+        pull $portzap_dir $pull_mask
         break
         ;;
     "install")
-        install
+        require_root
+        require_deps git
+        install $ports_dir $portzap_dir $libexec_dir $portzap_file
         break
         ;;
     *)
-        help
+        echo "Usage: portzap clone|pull|install"
         break
         ;;
     esac

libexec/portzap/commands/clone

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+clone() {
+    portzap_dir=$1
+    ports_url=$2
+    clone_mask=$3
+
+    if [ -e "$portzap_dir/.git" ]; then
+        echo "$portzap_dir has already been cloned."
+        echo "Run 'portzap pull' instead."
+        exit 1
+    fi
+    umask $clone_mask
+    git clone $ports_url $portzap_dir
+}

libexec/portzap/commands/install

@@ -0,0 +1,39 @@
+#!/bin/sh
+
+install() {
+    ports_dir=$1
+    portzap_dir=$2
+    libexec_dir=$3
+    portzap_file=$4
+
+    cd $portzap_dir
+    if [ -e "$portzap_file" ]; then
+        rev=$(cat $portzap_file)
+        nw_files=$(git diff --name-only --diff-filter=AM $rev..HEAD | cut -d / -f1 -f2 | uniq)
+        rm_files=$(git diff --name-only --diff-filter=D $rev..HEAD)
+        for file in $rm_files; do
+            echo RM $ports_dir/$file
+            rm $ports_dir/$file
+        done
+        for file in $nw_files; do
+            if [ -f "$file" ]; then
+                echo $file
+                $libexec_dir/install-file $ports_dir $file
+            else
+                dir=$file
+                $libexec_dir/install-directory $ports_dir $libexec_dir $dir
+            fi
+        done
+    else
+        find -s . -maxdepth 1 -type f \
+            \( -not -name ".gitignore" \) \
+            \( -not -name ".arcconfig" \) \
+            -exec $libexec_dir/install-file $ports_dir {} +
+        find -s . -maxdepth 1 -type d \
+            \( -not -name "." \) \
+            \( -not -name ".git" \) \
+            \( -not -name ".hooks" \) \
+            -exec $libexec_dir/install-directory $ports_dir $libexec_dir {} +
+    fi
+    echo $(git rev-parse HEAD) > $portzap_file
+}

libexec/portzap/commands/pull

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+pull() {
+    portzap_dir=$1
+    pull_mask=$2
+
+    if [ -e "$portzap_dir/.git" ]; then
+        umask $pull_mask
+        cd $portzap_dir
+        git pull --rebase origin hardenedbsd/main
+    else
+        echo "Run 'portzap clone' first."
+        exit 1
+    fi
+}

libexec/portzap/functions/perms.sh

@@ -1,21 +0,0 @@
-##
-# Returns true when current user is in _portzap group
-has_portzap_access() {
-    groups=$(id -Gn)
-    in_group=1
-    for g in $groups; do
-        if [ $g = "_portzap" ];
-        then
-            in_group=0
-        fi
-    done
-    return $in_group
-}
-
-##
-# Returns true when current user is root
-user_is_not_root() {
-    user_id=$(id -u)
-    result=$(test $user_id -ne "0")
-    return $result
-}

libexec/portzap/functions/requirements.sh

@@ -0,0 +1,26 @@
+require_deps() {
+    deps=$1
+    for dep in $deps; do
+        which -s $dep
+        if [ $? -ne 0 ]; then
+            echo $dep is required, but not found
+            exit 1
+        fi
+    done
+}
+
+require_group() {
+    group=$1
+    cmd=$(id -Gn | tr ' ' '\n' | grep ^${group}$)
+    if [ $cmd != $group ]; then
+        echo "You must be a member of the '$group' group to run this command."
+        exit 1
+    fi
+}
+
+require_root() {
+    if [ $(id -u) -ne 0 ]; then
+        echo "The install command must be run as root."
+        exit 1
+    fi
+}