@humanu/orchestra 0.5.53 → 0.5.55
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
package/resources/api/tmux.sh
CHANGED
|
@@ -446,24 +446,17 @@ tmux_list_sessions_for_slug() {
|
|
|
446
446
|
local p2_new="${slug}${d}${hash_slug}${d}"
|
|
447
447
|
local p1_old="${ORCH_PREFIX}${slug}${d}${hash_path}${d}"
|
|
448
448
|
local p2_old="${slug}${d}${hash_path}${d}"
|
|
449
|
-
local p1_plain="${ORCH_PREFIX}${slug}${d}"
|
|
450
|
-
local p2_plain="${slug}${d}"
|
|
451
|
-
|
|
452
449
|
local p1_branch_hash=""
|
|
453
450
|
local p2_branch_hash=""
|
|
454
|
-
local p1_branch_plain=""
|
|
455
|
-
local p2_branch_plain=""
|
|
456
451
|
if [[ -n "$branch_name" ]]; then
|
|
457
452
|
p1_branch_hash="${ORCH_PREFIX}${branch_name}${d}${hash_path}${d}"
|
|
458
453
|
p2_branch_hash="${branch_name}${d}${hash_path}${d}"
|
|
459
|
-
p1_branch_plain="${ORCH_PREFIX}${branch_name}${d}"
|
|
460
|
-
p2_branch_plain="${branch_name}${d}"
|
|
461
454
|
fi
|
|
462
455
|
|
|
463
456
|
# List sessions with any known prefix variant
|
|
464
457
|
tmux list-sessions -F '#{session_name}|||#{session_last_attached}|||#{session_activity}' 2>/dev/null \
|
|
465
458
|
| sed 's/|||/\t/g' \
|
|
466
|
-
| awk -v a="$p1_new" -v b="$p2_new" -v c="$p1_old" -v d="$p2_old" -v e="$
|
|
459
|
+
| awk -v a="$p1_new" -v b="$p2_new" -v c="$p1_old" -v d="$p2_old" -v e="$p1_branch_hash" -v f="$p2_branch_hash" 'BEGIN{FS="\t"} (length(a)>0 && index($1, a)==1) || (length(b)>0 && index($1, b)==1) || (length(c)>0 && index($1, c)==1) || (length(d)>0 && index($1, d)==1) || (length(e)>0 && index($1, e)==1) || (length(f)>0 && index($1, f)==1) {print $1"\t"$2"\t"$3}' \
|
|
467
460
|
| sort -t $'\t' -k2,2nr -k3,3nr \
|
|
468
461
|
| awk -F '\t' '{print $1}' | awk '!seen[$0]++' || true
|
|
469
462
|
else
|
|
Binary file
|
|
Binary file
|
|
Binary file
|