From db084ca477d11f0dbae9f7694d767cd16193fe84 Mon Sep 17 00:00:00 2001 From: Zach DeCook Date: Fri, 25 Sep 2026 15:26:48 -0400 Subject: Update my dotfiles --- .local/bin/gnome-terminal-newtab | 2 +- .local/bin/jira-CR.php | 2 +- .local/bin/jira-codereview | 3 +-- .local/bin/jira-ticketstatus.php | 10 ++++++++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.local/bin/gnome-terminal-newtab b/.local/bin/gnome-terminal-newtab index f982097..cf3bd8d 100755 --- a/.local/bin/gnome-terminal-newtab +++ b/.local/bin/gnome-terminal-newtab @@ -14,7 +14,7 @@ echo GNOME_TERMINAL_SERVICE="$GNOME_TERMINAL_SERVICE" >> /tmp/terminal-newtab.lo echo "$@" "\n" >> /tmp/terminal-newtab.log if test "$1" = "--" && test "$2" = "micro"; then - directory="$(dirname "$3")" + directory="$(dirname "$3" | sed 's@zach.overnightbdc.com.*@zach.overnightbdc.com@g')" echo "WORKING_DIRECTORY=$directory" >> /tmp/terminal-newtab.log /usr/bin/gnome-terminal --working-directory="$directory" --tab "$@" else diff --git a/.local/bin/jira-CR.php b/.local/bin/jira-CR.php index f9e673d..2c55bab 100755 --- a/.local/bin/jira-CR.php +++ b/.local/bin/jira-CR.php @@ -103,7 +103,7 @@ function process_pr($pr, $tickets, $ticketLabels, $onlyShowNeedsReview = false) $pr_ticket = null; $pr_ticket = in_array($pr['headRefName'], $tickets) ? $pr['headRefName'] : null; - $pr_ticket ??= (preg_match("/^[^: ]*/", $pr['title'], $matches) && in_array($matches[0], $tickets)) ? $matches[0] : null; + $pr_ticket ??= (preg_match("/^[^: _]*/", $pr['title'], $matches) && in_array($matches[0], $tickets)) ? $matches[0] : null; if ($pr_ticket) { $has_pr[$pr_ticket] = true; // These are github PR's that are in code review in Jira diff --git a/.local/bin/jira-codereview b/.local/bin/jira-codereview index 3b10c10..05975cd 100755 --- a/.local/bin/jira-codereview +++ b/.local/bin/jira-codereview @@ -44,5 +44,4 @@ printf "%s - %s %s CR\n" "$start" "$end" "$ticket" | wl-copy echo "Do you want to move the ticket?" echo 'jira-cli issue edit '$ticket' --label DBA_Approved --no-input' echo 'jira-cli issue move '$ticket' "Check out My Work"' #"Pending Demo"' -echo 'jira-cli issue edit '$ticket' --label "Post-mortem_(Demo)" --no-input && jira-cli issue move '$ticket' "Testing"' - +echo 'jira-cli issue edit '$ticket' --label "Post-mortem_(Demo)" --no-input && jira-cli issue move '$ticket' "Check out My Work" && sleep 5 && jira-cli issue move '$ticket' "Ready for a QA to work"' #"Testing" diff --git a/.local/bin/jira-ticketstatus.php b/.local/bin/jira-ticketstatus.php index 04a26de..984e699 100755 --- a/.local/bin/jira-ticketstatus.php +++ b/.local/bin/jira-ticketstatus.php @@ -40,7 +40,9 @@ function linkify(string $key): string { //echo implode(' ', $tickets); //exit(1); -$keys = implode(',', array_filter($tickets, fn($x) => str_starts_with($x, 'LAMP-'))); +//$keys = implode(',', array_filter($tickets, fn($x) => str_starts_with($x, 'LAMP-'))); // prefixed +$keys = implode(',', array_map(fn($x) => 'LAMP-' . $x, array_filter($tickets, fn($x) => is_numeric($x) ))); // add prefix + $command = "jira-cli issues list -q 'project = LAMP and key in ($keys)' --columns=KEY,STATUS --plain | grep -v '^KEY\b'"; //echo $command; $jira_tickets = explode("\n", rtrim(shell_exec($command))); @@ -49,14 +51,18 @@ $search = $replace = []; foreach ($jira_tickets as $jira_ticket) { [$key, $status] = explode("\t", $jira_ticket); $ticket_status[$key] = $status; - $search[] = $key; + $search[] = str_replace('LAMP-', '', $key); $replace[] = status_to_ansi($status) . linkify($key); // $search_replace[$key] = } +//echo implode(',', $search); $search[] = "HOLIDAY"; $replace[] = "\033[0m" . "HOLIDAY"; +$search[] = "Holiday"; +$replace[] = "\033[0m" . "Holiday"; + $search[] = "PTO"; $replace[] = "\033[0m" . "PTO"; -- cgit 1.4.1