Update zrep to version 0.0.3. New zrep-logo.svg. Bug fixes and enhancements.

2024-03-17 09:04:23 +01:00
1 parent c3962c72a0
commit d0fed1720e
@@ -2,7 +2,7 @@

 setopt extendedglob

-VERSION="0.0.2" # Sat-2024-03-13
+VERSION="0.0.3" # Sun-2024-03-17
 ZREP="Zsh Repository Tool"
 # Define the default path to .zreprc
 ZREP_CONFIG="${HOME}/.zreprc"
@@ -189,7 +189,7 @@ EOF

    if [[ $(zrep_find_string zini) -eq 0 ]]; then
        mkdir -p "${install_dir}/functions/zini"
-        curl -s https://raw.githubusercontent.com/kekePower/zini/main/zini -o "${install_dir}/functions/zini/zini"
+        zrep_global_downloader https://raw.githubusercontent.com/kekePower/zini/main/zini -o "${install_dir}/functions/zini/zini"
        echo "Adding 'zini' path to fpath in ${zshrc_file}"
        echo "fpath=(${install_dir}/functions/zini \$fpath)" >> ${zshrc_file}
        autoload -Uz zini
@@ -229,7 +229,7 @@ EOF
    if [[ ! -d ${install_dir}/themes ]]; then
        echo "Installing the Classic theme to ${install_dir}/themes"
        mkdir -p ${install_dir}/themes
-        curl -s https://git.kekepower.com/kekePower/zrep/raw/branch/main/themes/classic -o ${install_dir}/themes/classic
+        zrep_global_downloader https://git.kekepower.com/kekePower/zrep/raw/branch/main/themes/classic -o ${install_dir}/themes/classic
    fi
    echo "zrep initialization complete."
    echo "Remember to 'source ${zshrc_file}' to load the 'zrep' settings."
@@ -259,7 +259,7 @@ function zrep_parse_remote() {
    local json_data

    # Fetch JSON data from the URL
-    json_data=$(curl -s "${url}")
+    json_data=$(zrep_global_downloader "${url}")

    # Directly extract the details based on author_name and script_name
    dlurl=$(echo "${json_data}" | jq -r --arg author_name "$author_name" --arg script_name "$script_name" '.authors[] | select(.name==$author_name) | .scripts[] | select(.name==$script_name) | .dlurl')
@@ -464,12 +464,32 @@ function zrep_check_if_installed() {
    fi
 }

+function zrep_global_downloader() {
+    case ${config[global_downloader]} in
+        curl)
+            dloader="curl -s -A \"zrep ${VERSION} (curl)\""
+            ;;
+        wget)
+            dloader="wget -q -U \"zrep ${VERSION} (wget)\""
+            ;;
+        wget2)
+            dloader="wget2 -q -U \"zrep ${VERSION} (wget2)\""
+            ;;
+        *)
+            echo "Invalid Downloader."
+            exit
+            ;;
+    esac
+    eval ${dloader} ${1}
+}
+
 typeset -A updatesAvailable
 function zrep_check_for_updates() {
+
    local remoteFile="${config[global_repo_url]}/packages.json"
    # local localFile="${config[main_zrep_install_dir]}/installed.json"
    zrep_installed_json
-    local remotePackages=$(curl -s "${remoteFile}")
+    local remotePackages=$(zrep_global_downloader "${remoteFile}")

    # Reset global variables
    updatesAvailable=()
@@ -556,24 +576,24 @@ function zrep_download_package() {
  local http_status
  local cmd

-  case "${config[global_downloader]}" in
-    curl)
-      downloader="curl"
-      cmd="curl -s -o \"$ZipFile\" \"$DownloadURL\" -w \"%{http_code}\""
-      ;;
-    wget)
-      downloader="wget"
-      cmd="wget -q -O \"$ZipFile\" \"$DownloadURL\"; echo $?"
-      ;;
-    wget2)
-      downloader="wget2"
-      cmd="wget2 -q -O \"$ZipFile\" \"$DownloadURL\"; echo $?"
-      ;;
-    *)
-      zrep_msg debug "Unsupported or unspecified downloader: '${config[global_downloader]}'."
-      return 1
-      ;;
-  esac
+case "${config[global_downloader]}" in
+  curl)
+    downloader="curl"
+    cmd="curl -A \"zrep ${VERSION} (curl)\" -s -o \"$ZipFile\" \"$DownloadURL\" -w \"%{http_code}\""
+    ;;
+  wget)
+    downloader="wget"
+    cmd="wget -U \"zrep ${VERSION} (wget)\" -q -O \"$ZipFile\" \"$DownloadURL\"; echo $?"
+    ;;
+  wget2)
+    downloader="wget2"
+    cmd="wget2 -U \"zrep ${VERSION} (wget2)\" -q -O \"$ZipFile\" \"$DownloadURL\"; echo $?"
+    ;;
+  *)
+    zrep_msg debug "Unsupported or unspecified downloader: '${config[global_downloader]}'."
+    return 1
+    ;;
+esac

  while (( attempt <= retries )); do
    zrep_msg sub "Attempt $attempt of $retries: Downloading using $downloader..."
@@ -1 +1,46 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1024" zoomAndPan="magnify" viewBox="0 0 768 767.999994" height="1024" preserveAspectRatio="xMidYMid meet" version="1.0"><defs><filter x="0%" y="0%" width="100%" height="100%" id="109c06c3ce"><feColorMatrix values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0" color-interpolation-filters="sRGB"/></filter><filter x="0%" y="0%" width="100%" height="100%" id="18f1f214d4"><feColorMatrix values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0.2126 0.7152 0.0722 0 0" color-interpolation-filters="sRGB"/></filter><image x="0" y="0" width="1024" xlink:href="data:image/png;base64,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 truncated
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="1024.000000pt" height="1024.000000pt" viewBox="0 0 1024.000000 1024.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.16, written by Peter Selinger 2001-2019
+</metadata>
+<g transform="translate(0.000000,1024.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M0 5120 l0 -5120 5120 0 5120 0 0 5120 0 5120 -5120 0 -5120 0 0
+-5120z m7865 4258 c36 -7 65 -16 65 -19 0 -4 14 -11 32 -14 17 -4 54 -20 82
+-36 28 -16 75 -41 104 -56 28 -14 52 -30 52 -35 0 -4 5 -8 11 -8 15 0 63 -39
+171 -140 225 -211 361 -450 416 -734 16 -85 17 -271 17 -2956 l0 -2865 -23
+-110 c-29 -143 -54 -220 -99 -310 -83 -167 -259 -370 -420 -486 -99 -72 -247
+-147 -358 -182 -195 -61 -46 -58 -3110 -55 l-2790 4 -85 21 c-340 86 -572 230
+-780 484 -49 60 -90 117 -90 125 0 8 -4 14 -9 14 -5 0 -11 8 -15 18 -3 9 -17
+35 -30 57 -14 22 -25 48 -26 58 0 9 -4 17 -10 17 -5 0 -12 16 -16 35 -3 19
+-10 35 -14 35 -5 0 -11 22 -15 50 -4 27 -11 52 -16 56 -5 3 -9 18 -9 34 0 16
+-4 32 -10 35 -13 8 -14 5915 -1 5915 5 0 12 25 16 55 3 30 11 55 16 55 5 0 9
+11 9 25 0 14 5 25 11 25 7 0 10 12 7 30 -3 17 -1 30 4 30 4 0 8 6 8 14 0 8 6
+17 13 20 10 5 9 7 0 12 -7 3 -13 10 -13 15 0 6 5 7 10 4 6 -4 13 7 16 24 4 17
+10 31 14 31 5 0 11 13 15 29 3 16 13 32 21 35 8 3 14 10 14 16 0 6 11 22 25
+36 14 14 25 34 25 44 0 11 7 20 15 20 8 0 15 5 15 11 0 6 29 40 65 75 36 36
+65 69 65 74 0 6 5 10 11 10 15 0 49 39 49 57 0 7 3 12 8 11 17 -3 50 19 93 63
+43 43 82 66 102 61 11 -3 38 25 35 35 -2 4 8 9 22 11 30 3 100 34 100 44 0 3
+15 10 33 13 17 4 41 14 52 21 11 8 30 14 42 14 13 0 23 4 23 9 0 4 28 13 63
+18 98 16 5889 17 5972 1z"/>
+<path d="M3091 8009 c-180 -21 -329 -83 -468 -194 -162 -130 -257 -281 -310
+-495 -17 -72 -18 -160 -18 -1950 l0 -1875 27 -97 c48 -170 123 -296 253 -423
+144 -141 320 -225 514 -246 63 -6 693 -9 1831 -7 1614 3 1740 5 1800 21 240
+65 440 203 565 391 61 93 95 169 127 287 l23 84 0 1865 c0 1765 -1 1869 -18
+1942 -38 163 -104 290 -211 405 -151 163 -337 264 -541 293 -87 12 -3467 11
+-3574 -1z m3138 -1163 c98 -33 189 -107 233 -190 92 -178 68 -453 -53 -590
+-32 -37 -228 -185 -364 -276 -44 -29 -136 -92 -205 -140 -196 -136 -861 -591
+-1114 -761 -271 -182 -296 -203 -296 -250 0 -38 20 -72 53 -91 17 -10 223 -14
+912 -18 l890 -5 57 -28 c159 -78 214 -263 128 -425 -39 -73 -83 -115 -160
+-151 l-55 -26 -1324 -3 c-876 -2 -1342 1 -1379 8 -123 22 -228 106 -285 227
+-27 58 -32 82 -35 163 -9 221 66 353 287 502 58 39 183 126 276 192 94 67 222
+157 285 200 63 42 208 141 322 219 327 225 409 281 643 440 345 235 376 264
+346 321 -29 53 17 51 -1006 56 l-950 5 -42 23 c-107 57 -155 133 -161 252 -5
+95 23 174 82 238 78 84 140 112 276 122 52 4 655 7 1340 6 1171 -2 1248 -3
+1299 -20z"/>
+</g>
+</svg>