From 8f1ffeb675b18803473ff8200da81d1dc770c330 Mon Sep 17 00:00:00 2001
From: Brian Zalewski <brian@megabyte.space>
Date: Thu, 2 Feb 2023 02:15:14 +0000
Subject: [PATCH] Update 4 files

- /home/.chezmoitemplates/universal/profile-inline
- /home/.chezmoiscripts/_universal/run_before_01-add-temporary-includes.tmpl
- /home/.chezmoidata.yaml
- /software.yml
---
 home/.chezmoidata.yaml                        |  1 -
 .../run_before_01-add-temporary-includes.tmpl | 20 +++++--------------
 .../universal/profile-inline                  |  3 +++
 software.yml                                  | 13 ------------
 4 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/home/.chezmoidata.yaml b/home/.chezmoidata.yaml
index 762f898a..11f4ec90 100644
--- a/home/.chezmoidata.yaml
+++ b/home/.chezmoidata.yaml
@@ -577,7 +577,6 @@ softwareGroups:
     - java
     - libimobiledevice
     - rust
-    - sdkman
     - snapcraft
     - solidity
     - upx
diff --git a/home/.chezmoiscripts/_universal/run_before_01-add-temporary-includes.tmpl b/home/.chezmoiscripts/_universal/run_before_01-add-temporary-includes.tmpl
index 756de598..8d22f403 100644
--- a/home/.chezmoiscripts/_universal/run_before_01-add-temporary-includes.tmpl
+++ b/home/.chezmoiscripts/_universal/run_before_01-add-temporary-includes.tmpl
@@ -1,26 +1,16 @@
 {{- if (ne .host.distro.family "windows") -}}
 #!/usr/bin/env bash
 
-### Ensure /tmp/tmp-profile is created and owned by root
-if [ ! -f /tmp/tmp-profile ]; then
-    # Add pre-scaffolding profile to /tmp/tmp-profile so it's easier to navigate through scripts
-    cat <<'EOF' > /tmp/tmp-profile
+### Ensure /tmp/tmp-profile is created
+# Add pre-scaffolding profile to /tmp/tmp-profile so it's easier to navigate through scripts
+cat <<'EOF' > /tmp/tmp-profile
 {{ includeTemplate "universal/profile-inline" }}
 EOF
-    
-    # Make /tmp/tmp-profile owned by root to prevent tampering
-    sudo chown root /tmp/tmp-profile
-fi
 
 ### Ensure /tmp/tmp-logg is created and owned by root
-if [ ! -f /tmp/tmp-logg ]; then
-    # Add pre-scaffolding /tmp/tmp-logg
-    cat <<'EOF' > /tmp/tmp-logg
+# Add pre-scaffolding /tmp/tmp-logg
+cat <<'EOF' > /tmp/tmp-logg
 {{ includeTemplate "universal/logg-inline" }}
 EOF
-    
-    # Make /tmp/tmp-logg owned by root to prevent tampering
-    sudo chown root /tmp/tmp-logg
-fi
 
 {{ end -}}
diff --git a/home/.chezmoitemplates/universal/profile-inline b/home/.chezmoitemplates/universal/profile-inline
index d357c48d..8ec2151f 100644
--- a/home/.chezmoitemplates/universal/profile-inline
+++ b/home/.chezmoitemplates/universal/profile-inline
@@ -27,6 +27,9 @@ elif [ -f "/opt/homebrew/bin/brew" ]; then
   eval "$(/opt/homebrew/bin/brew shellenv)"
 fi
 
+### SDKMan
+export SDKMAN_DIR="$XDG_DATA_HOME/sdkman"
+
 ### Volta
 export VOLTA_HOME="$XDG_DATA_HOME/volta"
 export PATH="$VOLTA_HOME/bin:$PATH"
diff --git a/software.yml b/software.yml
index b92a8a91..05f4c65d 100644
--- a/software.yml
+++ b/software.yml
@@ -6659,19 +6659,6 @@ softwarePackages:
     github: github.com/chmln/sd
     pacman: sd
     pkg: sd
-    _service: false
-  sdkman:
-    _bin: sdkman
-    _desc: '[SDKMAN](https://sdkman.io/) is a tool for managing multiple versions of various Software Development Kits (SDKs) for the JVM on any UNIX-based system. It provides a convenient command line interface for installing, switching, removing and listing candidates. With SDKMAN, you can install and manage dependencies like Java, Groovy, Scala, Kotlin, and Ceylon. You can also use it to manage Ant, Gradle, Grails, Maven, SBT, Spark, Spring Boot, Vert.x, and many [other SDKs](https://sdkman.io/sdks).'
-    _docs: https://sdkman.io/install
-    _github: https://github.com/sdkman/sdkman-cli
-    _home: https://sdkman.io/
-    _name: SDKMAN
-    _note: SDKMan is installed via .chezmoiscripts
-    # ansible: professormanhattan.sdkman
-
-    _service: false
-    _type: cli
   seconion:
     _bin: null
     _desc: '[Security Onion](https://securityonionsolutions.com/) is a free and open source Linux distribution for threat hunting, enterprise security monitoring, and log management. It includes Elasticsearch, Logstash, Kibana, Snort, Suricata, Bro, Wazuh, Sguil, Squert, NetworkMiner, and many other security tools. The easy-to-use Setup wizard allows you to build an army of distributed sensors for your enterprise in minutes! This role takes it a step further and automates the whole setup process.'