Merge branch 'master' of gitlab.com:rehashedsalt/home

This commit is contained in:
Salt 2019-12-31 16:37:23 -06:00
commit 4b08393aad
7 changed files with 7 additions and 6 deletions

2
.bin

@ -1 +1 @@
Subproject commit 17b2ebada2a999f5c768ce189879b0fc54f0a6de
Subproject commit 759ba105438e7d35ac6e65ea4156de03cd588cbb

View File

@ -281,6 +281,7 @@ _ps1bash() {
fg_bold="\[\e[1m\]"
# Add hostname prefix in SSH sessions
unset prefix
# Yes, shellcheck. I get it. That's what the or is for
#shellcheck disable=2039
if [ "$HOSTNAME" = "phys-saltshaker" ] || [ "$(hostname)" = "phys-saltshaker" ]; then

@ -1 +1 @@
Subproject commit 2d9380d75c5c27a3241925d24ab3be8977a43207
Subproject commit 5f84325cd811ec179b7f3642652438c6a45b174d

@ -1 +1 @@
Subproject commit 53bd3279da783cd5c1b1fafb4ff31077e81b6333
Subproject commit ef6df46efe5ac5289f084045e57c492205bd08b5

@ -1 +1 @@
Subproject commit b6c8c8419240bdd29b5eb51a47d488fd390deed5
Subproject commit 2e4a8c485cdf601bb2f2761ea68c09750a0b82e0

@ -1 +1 @@
Subproject commit 27bf49b1fb3c851406dffef875991d2536f2c974
Subproject commit b2fe18239d862120778175c0e1a768c74a5cb6c0

@ -1 +1 @@
Subproject commit e9fb0914dba5bdfe2feaa364dda2e9495c5620a2
Subproject commit a553410f1bdb9000fbc764069f3a5ec3454a02bc