From 6aff77ed71ad0f9c8841942006149b1d99a2e671 Mon Sep 17 00:00:00 2001
From: Sall <sall@w-ss.io>
Date: Sat, 13 Apr 2024 05:03:25 +0100
Subject: [PATCH 1/2] Delete lib/zsh/git-progress.zsh

Signed-off-by: Sall <sall@w-ss.io>
---
 lib/zsh/git-progress.zsh | 175 ---------------------------------------
 1 file changed, 175 deletions(-)
 delete mode 100755 lib/zsh/git-progress.zsh

diff --git a/lib/zsh/git-progress.zsh b/lib/zsh/git-progress.zsh
deleted file mode 100755
index a0b9529..0000000
--- a/lib/zsh/git-progress.zsh
+++ /dev/null
@@ -1,175 +0,0 @@
-#!/usr/bin/env zsh
-
-builtin emulate -LR zsh
-builtin setopt extended_glob warn_create_global typeset_silent
-
-{ typeset -g COLS="$(tput cols)" } 2>/dev/null
-if (( COLS < 10 )) {
-  COLS=40
-}
-# Credit to molovo/revolver for the ideas
-typeset -ga progress_frames
-progress_frames=(
-  '0.1 ⠋ ⠙ ⠹ ⠸ ⠼ ⠴ ⠦ ⠧ ⠇ ⠏'
-  '0.1 ⣾ ⣽ ⣻ ⢿ ⡿ ⣟ ⣯ ⣷'
-  '0.1 ⢹ ⢺ ⢼ ⣸ ⣇ ⡧ ⡗ ⡏'
-)
-
-integer -g progress_style=$(( RANDOM % 2 + 1 )) cur_frame=1
-typeset -F SECONDS=0 last_time=0
-
-# Alpine Linux doesn't have tput; FreeBSD and Dragonfly BSD have termcap
-if whence tput &> /dev/null; then
-  if [[ $OSTYPE == freebsd* ]] || [[ $OSTYPE == dragonfly* ]]; then
-  # termcap commands
-  ZI_CNORM='tput ve'
-  ZI_CIVIS='tput vi'
-  else
-  # terminfo is more common
-  ZI_CNORM='tput cnorm'
-  ZI_CIVIS='tput civis'
-  fi
-fi
-
-if (( $+ZI_CNORM )); then
-  trap $ZI_CNORM EXIT INT TERM
-fi
-
-local first=1
-
-# Code by leoj3n
-timeline() {
-  local sp='▚▞'; sp="${sp:$2%2:1}"
-  # Maximal width is 24 characters
-  local bar="$(builtin print -f "%.$2s█%0$(($3-$2-1))s" "░▒▓█████████████████████" "")"
-  local -a frames_splitted
-  frames_splitted=( ${(@zQ)progress_frames[progress_style]} )
-  if (( SECONDS - last_time >= frames_splitted[1] )) {
-    (( cur_frame = (cur_frame+1) % (${#frames_splitted}+1-1) ))
-    (( cur_frame = cur_frame ? cur_frame : 1 ))
-    last_time=$SECONDS
-  }
-  builtin print -nr -- ${frames_splitted[cur_frame+1]}" "
-  builtin print -nPr "%F{201}"
-  builtin print -f "%s %s" "${bar// /░}" ""
-  builtin print -nPr "%f"
-}
-
-# $1 - n of objects
-# $2 - packed objects
-# $3 - total objects
-# $4 - receiving percentage
-# $5 - resolving percentage
-print_my_line() {
-  local col="%F{201}" col3="%F{201}" col4="%F{201}" col5="%F{046}"
-  [[ -n "${4#...}" && -z "${5#...}" ]] && local col="%F{226}" col3="%F{226}" col4="%F{226}"
-  [[ -n "${5#...}" ]] && local col="%F{201}" col3="%F{046}" col4="%F{046}"
-  if (( COLS >= 70 )) {
-    builtin print -Pnr -- "${col}OBJ%f: $1, ${col}PACK%f: $2/$3${${4:#...}:+, ${col3}REC%f: $4%}${${5:#...}:+, ${col4}RES%f: $5%}  "
-  } elif (( COLS >= 60 )) {
-    builtin print -Pnr -- "${col}OBJ%f: $1, ${${4:#...}:+, ${col3}REC%f: $4%}${${5:#...}:+, ${col4}RES%f: $5%}  "
-  } else {
-    builtin print -Pnr -- "${${4:#...}:+, ${col3}REC%f: $4%}${${5:#...}:+, ${col4}RES%f: $5%}  "
-  }
-  builtin print -n $'\015'
-}
-
-print_my_line_compress() {
-  local col="%F{201}" col3="%F{201}" col4="%F{201}" col5="%F{046}"
-  [[ -n "${4#...}" && -z "${5#...}" && -z "${6#...}" ]] && local col="%F{226}" col3="%F{226}" col4="%F{226}" col5="%F{226}"
-  [[ -n "${5#...}" && -z "${6#...}" ]] && local col="%F{201}" col3="%F{226}" col4="%F{226}" col5="%F{226}"
-  [[ -n "${6#...}" ]] && local col3="%F{201}" col4="%F{046}" col5="%F{046}"
-  if (( COLS >= 80 )) {
-    builtin print -Pnr -- "${col}OBJ%f: $1, ${col}PACK%f: $2/$3, ${col3}COMPR%f: $4%%${${5:#...}:+, ${col4}REC%f: $5%%}${${6:#...}:+, ${col5}RES%f: $6%%}  "
-  } elif (( COLS >= 65 )) {
-    builtin print -Pnr -- "${col}OBJ%f: $1, ${col3}COMPR%f: $4%%${${5:#...}:+, ${col4}REC%f: $5%%}${${6:#...}:+, ${col5}RES%f: $6%%}  "
-  } else {
-    builtin print -Pnr -- "${col}OBJ%f: $1, ${${5:#...}:+, ${col4}REC%f: $5%%}${${6:#...}:+, ${col5}RES%f: $6%%}  "
-  }
-  builtin print -n $'\015'
-}
-
-integer have_1_counting=0 have_2_total=0 have_3_receiving=0 have_4_deltas=0 have_5_compress=0
-integer counting_1=0 total_2=0 total_packed_2=0 receiving_3=0 deltas_4=0 compress_5=0
-integer loop_count=0
-
-IFS=''
-
-[[ $+ZI_CIVIS == 1 && -n $TERM ]] && eval $ZI_CIVIS
-
-if [[ -n $TERM ]] {
-{ command perl -pe 'BEGIN { $|++; $/ = \1 }; tr/\r/\n/' || \
-  gstdbuf -o0 gtr '\r' '\n' || \
-  cat } |& \
-while read -r line; do
-  (( ++ loop_count ))
-  if [[ "$line" = "Cloning into"* ]]; then
-    builtin print $line
-    continue
-  elif [[ "$line" = (#i)*user*name* || "$line" = (#i)*password* ]]; then
-    builtin print $line
-    continue
-  elif [[ "$line" = remote:*~*(Counting|Total|Compressing|Enumerating)* || "$line" = fatal:* ]]; then
-    builtin print $line
-    continue
-  fi
-  if [[ "$line" = (#b)"remote: Counting objects:"[\ ]#([0-9]##)(*) ]]; then
-    have_1_counting=1
-    counting_1="${match[1]}"
-  fi
-  if [[ "$line" = (#b)"remote: Enumerating objects:"[\ ]#([0-9]##)(*) ]]; then
-    have_1_counting=1
-    counting_1="${match[1]}"
-  fi
-  if [[ "$line" = (#b)*"remote: Total"[\ ]#([0-9]##)*"pack-reused"[\ ]#([0-9]##)* ]]; then
-    have_2_total=1
-    total_2="${match[1]}" total_packed_2="${match[2]}"
-  fi
-  if [[ "$line" = (#b)"Receiving objects:"[\ ]#([0-9]##)%([[:blank:]]#\(([0-9]##)/([0-9]##)\)|)* ]]; then
-    have_3_receiving=1
-    receiving_3="${match[1]}"
-    [[ -n "${match[2]}" ]] && {
-      have_2_total=1
-      total_packed_2="${match[3]}" total_2="${match[4]}"
-    }
-  fi
-  if [[ "$line" = (#b)"Resolving deltas:"[\ ]#([0-9]##)%* ]]; then
-    have_4_deltas=1
-    deltas_4="${match[1]}"
-  fi
-  if [[ "$line" = (#b)"remote: Compressing objects:"[\ ]#([0-9]##)"%"(*) ]]; then
-    have_5_compress=1
-    compress_5="${match[1]}"
-  fi
-  if (( loop_count >= 2 )); then
-    integer pr
-    (( pr = have_4_deltas ? deltas_4 / 10 : (
-        have_3_receiving ? receiving_3 / 10 : (
-        have_5_compress ? compress_5 / 10 : ( ( ( loop_count - 1 ) / 14 ) % 10 ) + 1 ) ) ))
-  timeline "" $pr 11
-    if (( have_5_compress )); then
-      print_my_line_compress "${${${(M)have_1_counting:#1}:+$counting_1}:-...}" \
-      "${${${(M)have_2_total:#1}:+$total_packed_2}:-0}" \
-      "${${${(M)have_2_total:#1}:+$total_2}:-0}" \
-      "${${${(M)have_5_compress:#1}:+$compress_5}:-...}" \
-      "${${${(M)have_3_receiving:#1}:+$receiving_3}:-...}" \
-      "${${${(M)have_4_deltas:#1}:+$deltas_4}:-...}"
-    else
-      print_my_line "${${${(M)have_1_counting:#1}:+$counting_1}:-...}" \
-      "${${${(M)have_2_total:#1}:+$total_packed_2}:-0}" \
-      "${${${(M)have_2_total:#1}:+$total_2}:-0}" \
-      "${${${(M)have_3_receiving:#1}:+$receiving_3}:-...}" \
-      "${${${(M)have_4_deltas:#1}:+$deltas_4}:-...}"
-    fi
-  fi
-done
-
-} else {
-  grep fatal:
-}
-
-builtin print
-
-[[ $+ZI_CNORM == 1 && -n $TERM ]] && eval $ZI_CNORM
-
-unset ZI_CNORM ZI_CIVIS

From f4f4a8ee69a0418ae4b0b662a4fe3307615371dd Mon Sep 17 00:00:00 2001
From: Sall <sall@w-ss.io>
Date: Sat, 13 Apr 2024 05:25:25 +0100
Subject: [PATCH 2/2] Update rclone-action.yml

Signed-off-by: Sall <sall@w-ss.io>
---
 .github/workflows/rclone-action.yml | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/rclone-action.yml b/.github/workflows/rclone-action.yml
index 6ac2959..590ecfd 100644
--- a/.github/workflows/rclone-action.yml
+++ b/.github/workflows/rclone-action.yml
@@ -2,6 +2,7 @@
 name: "🔄 Rclone"
 on:
   push:
+    branches: [main]
     paths:
       - "lib/**"
   workflow_dispatch: {}
@@ -14,12 +15,9 @@ jobs:
   sync:
     if: github.repository == 'z-shell/zi-src'
     runs-on: ubuntu-latest
-    environment: "cloud-storage"
     env:
       local_path: "lib"
-      r2_remote_path: "r2store:r2-store/src"
-      #cdn_remote_path: "cdn:digital-space/src"
-      #cdn_us_central_remote_path: "cdn-us-central:gcp-space/src"
+      remote_path: "r2:r2-store/src"
     steps:
       - name: "⤵️ Check out code from GitHub"
         uses: actions/checkout@v4.1.1
@@ -27,17 +25,5 @@ jobs:
         uses: z-shell/.github/actions/rclone@56c2250b6e49c6d510a9dc4107ea8ad3b9135c2f
         with:
           config: ${{ secrets.R2_STORE }}
-          args: "copy ${{ env.local_path }} ${{ env.r2_remote_path }}"
+          args: "copy ${{ env.local_path }} ${{ env.remote_path }}"
           debug: false
-        #- name: "⏫ Run rclone/cdn"
-        #uses: z-shell/.github/actions/rclone@v1.0.7
-        #with:
-        #  config: ${{ secrets.CDN_STORE }}
-        #  args: "sync ${{ env.local_path }} ${{ env.cdn_remote_path }}"
-        #  debug: false
-        #- name: "⏫ Run rclone/cdn_us_central_remote_path"
-        #uses: z-shell/.github/actions/rclone@v1.0.7
-        #with:
-        #  config: ${{ secrets.GCP_STORE }}
-        #  args: "sync ${{ env.local_path }} ${{ env.cdn_us_central_remote_path }}"
-        #  debug: false