From ed21638ed008b57ce84fcef4df5e4292a398c0cd Mon Sep 17 00:00:00 2001
From: Anthony Perkins <anthony@acperkins.com>
Date: Fri, 18 Jun 2021 21:36:41 +0100
Subject: [PATCH] Stop with /acp

---
 mkuserdir.sh                | 23 -----------------------
 roles/home-cli/files/bashrc |  5 ++---
 2 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100755 mkuserdir.sh

diff --git a/mkuserdir.sh b/mkuserdir.sh
deleted file mode 100755
index 4c77446..0000000
--- a/mkuserdir.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-# Change variables below if needed.
-TARGET_USER=acp
-TARGET_GROUP=$TARGET_USER
-TARGET_DIR="/$TARGET_USER"
-
-# Create root directory. Fail if it cannot be created.
-install -d -m 700 -o $TARGET_USER -g $TARGET_GROUP $TARGET_DIR || exit 1
-
-# Create subdirectories.
-install -d -o $TARGET_USER -g $TARGET_GROUP $TARGET_DIR/bin
-install -d -o $TARGET_USER -g $TARGET_GROUP $TARGET_DIR/data
-install -d -o $TARGET_USER -g $TARGET_GROUP $TARGET_DIR/doc
-install -d -o $TARGET_USER -g $TARGET_GROUP $TARGET_DIR/etc
-install -d -o $TARGET_USER -g $TARGET_GROUP $TARGET_DIR/lib
-install -d -o $TARGET_USER -g $TARGET_GROUP $TARGET_DIR/include
-install -d -o $TARGET_USER -g $TARGET_GROUP $TARGET_DIR/man
-install -d -o $TARGET_USER -g $TARGET_GROUP $TARGET_DIR/share
-install -d -o $TARGET_USER -g $TARGET_GROUP $TARGET_DIR/src
-
-# Set up symlinks.
-ln -s ../man $TARGET_DIR/share/man
diff --git a/roles/home-cli/files/bashrc b/roles/home-cli/files/bashrc
index 331e965..096fb14 100644
--- a/roles/home-cli/files/bashrc
+++ b/roles/home-cli/files/bashrc
@@ -21,15 +21,14 @@ then
 fi
 
 _acp_add_path () {
-	if ! [[ ":$PATH" =~ ":$1:" ]] && test -d "$1"
+	if ! [[ ":$PATH:" =~ ":$1:" ]] && test -d "$1"
 	then
 		PATH="$1:$PATH"
 	fi
 	export PATH
 }
 
-for dir in "/$USER/bin" \
-	   "$HOME/bin" \
+for dir in "$HOME/bin" \
 	   "$HOME/.cargo/bin" \
 	   "$HOME/opt/centos-git-common" \
 	   /usr/local/sbin \