From: Andrew DeFaria <A.DeFaria@cpanel.net>
Date: Tue, 21 Mar 2023 17:24:27 +0000 (+0000)
Subject: Merge branch 'master' of https://github.com/adefaria/clearscm
X-Git-Url: https://defaria.com/gitweb/?a=commitdiff_plain;h=901870f2fc61575bff838a8556a9fec652ec7d0b;hp=c3cf58d21fbf17e2a69ed7cd6e56a198e7252c63;p=clearscm.git

Merge branch 'master' of https://github.com/adefaria/clearscm
---

diff --git a/bin/jira b/bin/jira
index ed2f582..c84f38f 100755
--- a/bin/jira
+++ b/bin/jira
@@ -142,9 +142,9 @@ unless ( $ARGV[0] ) {
     my ( $status, @output ) = Utils::Execute("git branch --show-current 2>&1");
 
     unless ($status) {
-        $output[0] =~ /\w+-(\d+)/;
-
-        $ARGV[0] = $1;
+        if ($output[0] =~ /(\w+-)*(\d+)/) {
+            $ARGV[0] = $2;
+	}
     }
 }
 
diff --git a/rc/bash_login b/rc/bash_login
index 63c4e38..f7adefd 100644
--- a/rc/bash_login
+++ b/rc/bash_login
@@ -201,6 +201,7 @@ fi
 alias ll="ls -la"
 alias whence="type -p"
 alias mroe=more
+alias gti=git
 
 if [ $ARCHITECTURE = "cygwin" ]; then
   alias host=nslookup
diff --git a/rc/client_scripts/cPanel b/rc/client_scripts/cPanel
index 9721b09..de95ebd 100644
--- a/rc/client_scripts/cPanel
+++ b/rc/client_scripts/cPanel
@@ -38,7 +38,7 @@ fi
 # Intended to be used for root
 WIZARD="CPanel"
 
-export CDPATH=/usr/local
+#export CDPATH=/usr/local
 export ulc=/usr/local/cpanel
 export ulp=/usr/local/cp-monitoring-cpanel-plugin
 export ulw=/usr/local/cp-monitoring-whm-plugin