From b371a1642eb63dbfc56bf40d502018113407fd97 Mon Sep 17 00:00:00 2001
From: askiiart <dev@askiiart.net>
Date: Mon, 11 Sep 2023 22:22:20 -0500
Subject: [PATCH] Add ArmCord & Steam installs, + minor updates

---
 daily-use-pcs/gpg-config.batch     |  6 ++++++
 daily-use-pcs/setup-git.bash       | 32 +++++++++++++-----------------
 distro-specific.bash               |  5 +++--
 install-stuff/install-armcord.bash | 20 +++++++++++++++++++
 install-stuff/install-steam.bash   | 21 ++++++++++++++++++++
 5 files changed, 64 insertions(+), 20 deletions(-)
 create mode 100644 daily-use-pcs/gpg-config.batch
 create mode 100644 install-stuff/install-armcord.bash
 create mode 100644 install-stuff/install-steam.bash

diff --git a/daily-use-pcs/gpg-config.batch b/daily-use-pcs/gpg-config.batch
new file mode 100644
index 0000000..a5504ea
--- /dev/null
+++ b/daily-use-pcs/gpg-config.batch
@@ -0,0 +1,6 @@
+%echo Generating an example PGP key
+Key-Type: RSA
+Key-Length: 4096
+Name-Real: askiiart
+Name-Email: dev@askiiart.net
+Expire-Date: 0
\ No newline at end of file
diff --git a/daily-use-pcs/setup-git.bash b/daily-use-pcs/setup-git.bash
index 75e4bab..e6483ff 100755
--- a/daily-use-pcs/setup-git.bash
+++ b/daily-use-pcs/setup-git.bash
@@ -3,8 +3,6 @@
 set -e
 # Modify constants as needed
 GITEA_URL="https://git.askiiart.net"
-NAME="askiiart"
-EMAIL="dev@askiiart.net"
 
 # Note: This waits until enter is pressed
 # read -p "Press Enter to continue" < /dev/tty
@@ -60,20 +58,9 @@ if [ -d "${HOME}/.gnupg/" ]; then
     read -p "Enter the long ID of the key to be used for git:" KEY_ID
 else
 # Create GPG key
-    echo "> $ gpg --full-generate-key"
-    echo
-    echo Use the defaults, then real name "askiiart", email address \"dev@askiiart.net\", and comment \"git key\"\n
-    echo
-    gpg --full-generate-key
+    gpg --batch --gen-key gpg-config.batch
     read -p "Copy the long ID above, then paste it here: " KEY_ID
     echo $KEY_ID
-
-    # Export GPG key
-    gpg --armor --export $KEY_ID
-    echo This is the exported key, copy it and put it in GitHub/Gitea/whatever
-    echo Gitea URL: ${GITEA_URL}/user/settings/keys
-    echo GitHub URL: https://github.com/settings/gpg/new
-    read -p "Press enter when you're done" </dev/tty
 fi
 
 echo Doing git config stuff...
@@ -97,10 +84,6 @@ else
     # -f: file, -N: passphrase, -t: type
     ssh-keygen -f ~/.ssh/id_rsa -N "" -t rsa
     echo
-    cat ~/.ssh/id_rsa.pub
-    echo This is the SSH public key, copy it and put it in GitHub/Gitea/whatever
-    echo Gitea URL: ${GITEA_URL}/user/settings/keys
-    echo GitHub URL: https://github.com/settings/ssh/new
 fi
 
 # From https://superuser.com/a/954639
@@ -116,3 +99,16 @@ chmod 600 ~/.gnupg/*
 sudo chmod 700 $(ls -d $HOME/.gnupg/*/)
 
 read -p "Done. Now verify your SSH and GPG keys in Git*" </dev/tty
+
+# Export GPG key
+gpg --armor --export $KEY_ID
+echo This is the exported key, copy it and put it in GitHub/Gitea/whatever
+echo Gitea URL: ${GITEA_URL}/user/settings/keys
+echo GitHub URL: https://github.com/settings/gpg/new
+read -p "Press enter when you're done" </dev/tty
+
+cat ~/.ssh/id_rsa.pub
+echo This is the SSH public key, copy it and put it in GitHub/Gitea/whatever
+echo Gitea URL: ${GITEA_URL}/user/settings/keys
+echo GitHub URL: https://github.com/settings/ssh/new
+read -p "Press enter when you're done" </dev/tty
diff --git a/distro-specific.bash b/distro-specific.bash
index efe686e..5d7ecc1 100644
--- a/distro-specific.bash
+++ b/distro-specific.bash
@@ -8,9 +8,10 @@ fi
 command_exists() { type "$1" &>/dev/null; }
 
 if command_exists "apt-get"; then
-    ;
+    sudo apt update
+    sudo apt install curl -y
 elif command_exists "yum"; then
-    ;
+    sudo dnf config-manager --add-repo https://askiiart.net/repos/fedora/x86_64/askiiart.repo
 elif command_exists "pacman"; then
     WD=$(pwd)
     pacman -S --needed git base-devel
diff --git a/install-stuff/install-armcord.bash b/install-stuff/install-armcord.bash
new file mode 100644
index 0000000..531698d
--- /dev/null
+++ b/install-stuff/install-armcord.bash
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+set -e
+if [ $(whoami) == "root" ]; then
+    echo "Run as a normal user, not root"
+    exit 1
+fi
+
+command_exists() { type "$1" &>/dev/null; }
+
+if command_exists "apt-get"; then
+    sudo curl -L https://askiiart.net/repos/debian/bookworm/amd64/askiiart.list -C - -o /etc/apt/sources.list.d/askiiart.list
+    sudo apt update --allow-insecure-repositories
+    sudo apt install armcord -y
+elif command_exists "yum"; then
+    sudo dnf config-manager --add-repo https://askiiart.net/repos/fedora/x86_64/askiiart.repo
+elif command_exists "pacman"; then
+    yay -S armcord-bin
+else
+    echo "IDK, check ArmCord's GitHub repo: https://github.com/ArmCord/ArmCord"
+fi
diff --git a/install-stuff/install-steam.bash b/install-stuff/install-steam.bash
new file mode 100644
index 0000000..d85217a
--- /dev/null
+++ b/install-stuff/install-steam.bash
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+set -e
+if [ $(whoami) == "root" ]; then
+    echo "Run as a normal user, not root"
+    exit 1
+fi
+
+command_exists() { type "$1" &>/dev/null; }
+
+if command_exists "apt-get"; then
+    curl -LO https://cdn.cloudflare.steamstatic.com/client/installer/steam.deb
+    sudo dpkg -i steam.deb
+elif command_exists "yum"; then
+    sudo dnf install steam -y
+elif command_exists "pacman"; then
+    echo "[multilib]\nInclude = /etc/pacman.d/mirrorlist"
+    read -p "Enable the multilib repo in /etc/pacman.conf - look above`
+    $EDITOR /etc/pacman.conf
+else
+    echo "IDK"
+fi