From 2d4cc2a75db4fcaec63afa48a3fec3be3a0732b8 Mon Sep 17 00:00:00 2001
From: AJ ONeal <aj@therootcompany.com>
Date: Thu, 25 Jun 2020 02:46:14 +0000
Subject: [PATCH] wrap with block

---
 ssh-utils/ssh-adduser.sh | 72 +++++++++++++++++++++-------------------
 ssh-utils/ssh-pubkey.sh  | 40 +++++++++++-----------
 ssh-utils/ssh-setpass.sh |  8 +++--
 3 files changed, 63 insertions(+), 57 deletions(-)

diff --git a/ssh-utils/ssh-adduser.sh b/ssh-utils/ssh-adduser.sh
index 6400a0c..beb4492 100644
--- a/ssh-utils/ssh-adduser.sh
+++ b/ssh-utils/ssh-adduser.sh
@@ -1,37 +1,39 @@
 #!/bin/bash
 
-set -e
-set -u
-
-# TODO: a more complete VPS setup
-
-# TODO would $EUID be better?
-if [ "root" != "$(whoami)" ]; then
-  echo "webi adduser: running user is already a non-root user"
-  exit 0
-fi
-
-#apt-get -y update
-#apt-get -y install curl wget rsync git
-
-# Add User
-# TODO: might there be a better name?
-# me, this, user, self, person, i, who, do, tron
-adduser --disabled-password --gecos "" me
-my_password=$(openssl rand -hex 16)
-printf "$my_password"'\n'"$my_password" | passwd me
-adduser me sudo
-echo "me ALL=(ALL:ALL) NOPASSWD: ALL" | tee /etc/sudoers.d/me
-sudo -i -u me bash -c 'ssh-keygen -b 2048 -t rsa -f /home/me/.ssh/id_rsa -q -N ""'
-mkdir -p /home/me/.ssh/
-cp -r $HOME/.ssh/authorized_keys /home/me/.ssh/
-chmod 0600 me:me /home/me/.ssh/authorized_keys
-chown -R me:me /home/me/.ssh/
-
-# Install webi for the new user
-sudo -i -u me bash -c 'curl -fsSL https://webinstall.dev/webi | bash' \
-    || sudo -i -u me bash -c 'wget -q -O - https://webinstall.dev/webi | bash'
-
-# TODO ensure that ssh-password login is off
-
-echo "Created user 'me' with password '$my_password'"
+{
+    set -e
+    set -u
+
+    # TODO: a more complete VPS setup
+
+    # TODO would $EUID be better?
+    if [ "root" != "$(whoami)" ]; then
+      echo "webi adduser: running user is already a non-root user"
+      exit 0
+    fi
+
+    #apt-get -y update
+    #apt-get -y install curl wget rsync git
+
+    # Add User
+    # TODO: might there be a better name?
+    # me, this, user, self, person, i, who, do, tron
+    adduser --disabled-password --gecos "" me
+    my_password=$(openssl rand -hex 16)
+    printf "$my_password"'\n'"$my_password" | passwd me
+    adduser me sudo
+    echo "me ALL=(ALL:ALL) NOPASSWD: ALL" | tee /etc/sudoers.d/me
+    sudo -i -u me bash -c 'ssh-keygen -b 2048 -t rsa -f /home/me/.ssh/id_rsa -q -N ""'
+    mkdir -p /home/me/.ssh/
+    cp -r $HOME/.ssh/authorized_keys /home/me/.ssh/
+    chmod 0600 me:me /home/me/.ssh/authorized_keys
+    chown -R me:me /home/me/.ssh/
+
+    # Install webi for the new user
+    sudo -i -u me bash -c 'curl -fsSL https://webinstall.dev/webi | bash' \
+        || sudo -i -u me bash -c 'wget -q -O - https://webinstall.dev/webi | bash'
+
+    # TODO ensure that ssh-password login is off
+
+    echo "Created user 'me' with password '$my_password'"
+}
diff --git a/ssh-utils/ssh-pubkey.sh b/ssh-utils/ssh-pubkey.sh
index 044e1e1..9f07229 100644
--- a/ssh-utils/ssh-pubkey.sh
+++ b/ssh-utils/ssh-pubkey.sh
@@ -1,25 +1,27 @@
 #!/bin/bash
 
-set -e
-set -u
+{
+    set -e
+    set -u
 
-mkdir -p "$HOME/.ssh/"
+    mkdir -p "$HOME/.ssh/"
 
-if [ ! -f "$HOME/.ssh/id_rsa" ]; then
-    ssh-keygen -b 2048 -t rsa -f "$HOME/.ssh/id_rsa" -q -N ""
-    echo ""
-fi
+    if [ ! -f "$HOME/.ssh/id_rsa" ]; then
+        ssh-keygen -b 2048 -t rsa -f "$HOME/.ssh/id_rsa" -q -N ""
+        echo ""
+    fi
 
-if [ ! -f "$HOME/.ssh/id_rsa.pub" ]; then
-    ssh-keygen -y -f "$HOME/.ssh/id_rsa" > "$HOME/.ssh/id_rsa.pub"
-    echo ""
-fi
+    if [ ! -f "$HOME/.ssh/id_rsa.pub" ]; then
+        ssh-keygen -y -f "$HOME/.ssh/id_rsa" > "$HOME/.ssh/id_rsa.pub"
+        echo ""
+    fi
 
-# TODO use the comment (if any) for the name of the file
-echo ""
-echo "~/Downloads/id_rsa.$(whoami).pub":
-echo ""
-rm -f "$HOME/Downloads/id_rsa.$(whoami).pub":
-cp -r "$HOME/.ssh/id_rsa.pub" "$HOME/Downloads/id_rsa.$(whoami).pub"
-cat "$HOME/Downloads/id_rsa.$(whoami).pub"
-echo ""
+    # TODO use the comment (if any) for the name of the file
+    echo ""
+    echo "~/Downloads/id_rsa.$(whoami).pub":
+    echo ""
+    rm -f "$HOME/Downloads/id_rsa.$(whoami).pub":
+    cp -r "$HOME/.ssh/id_rsa.pub" "$HOME/Downloads/id_rsa.$(whoami).pub"
+    cat "$HOME/Downloads/id_rsa.$(whoami).pub"
+    echo ""
+}
diff --git a/ssh-utils/ssh-setpass.sh b/ssh-utils/ssh-setpass.sh
index 014b68a..4d399cd 100644
--- a/ssh-utils/ssh-setpass.sh
+++ b/ssh-utils/ssh-setpass.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 
-set -e
-set -u
+{
+    set -e
+    set -u
 
-ssh-keygen -p -f "$HOME/.ssh/id_rsa"
+    ssh-keygen -p -f "$HOME/.ssh/id_rsa"
+}
-- 
2.25.1