From a960c508f212ca534216e1533b80b8e7ec69196a Mon Sep 17 00:00:00 2001
From: Till Maas <opensource@till.name>
Date: Mon, 11 Nov 2019 10:48:28 +0100
Subject: [PATCH] Sync in current files from bash package

-  https://src.fedoraproject.org/rpms/bash/c/739b272e5f5d10cf27a847a44d09eb7f4b6ec89b?branch=master
-  https://src.fedoraproject.org/rpms/bash/c/329df36f8bbc303be618f06562ec2c4eebfd1d29?branch=master
-  https://src.fedoraproject.org/rpms/bash/c/e3b3cd9cec4a3bd12a792536c0ea131f5ba5bd72?branch=master
---
 dot-bash_profile |  4 ----
 dot-bashrc       | 22 ++++++++++++++++------
 rootfiles.spec   |  8 +++++++-
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/dot-bash_profile b/dot-bash_profile
index 3dc099a..55136b9 100644
--- a/dot-bash_profile
+++ b/dot-bash_profile
@@ -6,7 +6,3 @@ if [ -f ~/.bashrc ]; then
 fi
 
 # User specific environment and startup programs
-
-PATH=$PATH:$HOME/bin
-
-export PATH
diff --git a/dot-bashrc b/dot-bashrc
index 6e6d1e1..c2ad94d 100644
--- a/dot-bashrc
+++ b/dot-bashrc
@@ -1,12 +1,22 @@
 # .bashrc
 
-# User specific aliases and functions
-
-alias rm='rm -i'
-alias cp='cp -i'
-alias mv='mv -i'
-
 # Source global definitions
 if [ -f /etc/bashrc ]; then
 	. /etc/bashrc
 fi
+
+# User specific environment
+if ! [[ "$PATH" =~ "$HOME/.local/bin:$HOME/bin:" ]]
+then
+    PATH="$HOME/.local/bin:$HOME/bin:$PATH"
+fi
+export PATH
+
+# Uncomment the following line if you don't like systemctl's auto-paging feature:
+# export SYSTEMD_PAGER=
+
+# User specific aliases and functions
+ 
+alias rm='rm -i'
+alias cp='cp -i'
+alias mv='mv -i'
diff --git a/rootfiles.spec b/rootfiles.spec
index 4558542..669ed10 100644
--- a/rootfiles.spec
+++ b/rootfiles.spec
@@ -1,7 +1,7 @@
 Summary: The basic required files for the root user's directory
 Name: rootfiles
 Version: 8.1
-Release: 25%{?dist}
+Release: 26%{?dist}
 License: Public Domain
 
 # This is a Red Hat maintained package which is specific to
@@ -41,6 +41,12 @@ fi
 %config(noreplace) /root/.[A-Za-z]*
 
 %changelog
+* Mon Nov 11 2019 Till Maas <opensource@till.name> - 8.1-26
+- Sync in current files from bash package:
+  https://src.fedoraproject.org/rpms/bash/c/739b272e5f5d10cf27a847a44d09eb7f4b6ec89b?branch=master
+  https://src.fedoraproject.org/rpms/bash/c/329df36f8bbc303be618f06562ec2c4eebfd1d29?branch=master
+  https://src.fedoraproject.org/rpms/bash/c/e3b3cd9cec4a3bd12a792536c0ea131f5ba5bd72?branch=master
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 8.1-25
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild