Add --quiet parameter to update action

Reduces feedback outpu from fetching repo updates.
wimpysworld · Feb 14, 2023 · 478d069 · 478d069
1 parent dd0dff9
commit 478d069
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -59,7 +59,7 @@ cog.out(f"```\n{help}\n```")
 ]]] -->
 ```
 
-deb-get {update [--repos-only] | upgrade | show <pkg list> | install <pkg list>
+deb-get {update [--repos-only] [--quiet] | upgrade | show <pkg list> | install <pkg list>
         | reinstall <pkg list> | remove [--remove-repo] <pkg list>
         | purge [--remove-repo] <pkg list>
         | search [--include-unsupported] <regex> | cache | clean
@@ -76,6 +76,7 @@ update
     When --repos-only is provided, only initialize and update deb-get's
     external repositories, without updating apt or looking for updates of
     installed packages.
+    When --quiet is provided the fetching of deb-get repository updates is done without progress feedback.
 
 upgrade
     upgrade is used to install the newest versions of all packages currently

diff --git a/deb-get b/deb-get
@@ -651,12 +651,22 @@ function refresh_supported_cache_lists() {
 
 function update_repos() {
     local REPO_URL=""
+    # preserve current behaviour for now but allow modification via env
+    local CURL_VERBOSITY="-q --show-progress --progress=bar:force:noscroll "
+    local WGET_VERBOSITY="-q"
+
+    if [[ "$*" == *"--quiet"* ]]  ; then
+         CURL_VERBOSITY="-Ss"
+         WGET_VERBOSITY="-q"
+         export WGET_VERBOSITY CURL_VERBOSITY
+    fi
+
 
     for REPO in $(find "${ETC_DIR}" -maxdepth 1 -name "*.repo" ! -name 00-builtin.repo ! -name 99-local.repo -type f -printf "%f\n" | sed "s/.repo$//"); do
         export REPO
         fancy_message info "Updating ${ETC_DIR}/${REPO}"
         REPO_URL="$(head -n 1 "${ETC_DIR}/${REPO}.repo")"
-        ${ELEVATE} wget -q --show-progress --progress=bar:force:noscroll "${REPO_URL}/manifest" -O "${ETC_DIR}/${REPO}.repo"
+        ${ELEVATE} wget ${WGET_VERBOSITY} "${REPO_URL}/manifest" -O "${ETC_DIR}/${REPO}.repo"
 
         # ${ELEVATE} rm "${ETC_DIR}/${REPO}.d/* # we currently leave old litter : either <- this or maybe rm older ones
         # although so long as manifest is good we are OK
@@ -668,10 +678,10 @@ function update_repos() {
         awk -F/ '/github/  {print "# fetching github repo";
                             print "GITREPO="$4"/"$5;\
                             print "BRANCH="$6;\
-                            print "curl -L https://api.github.com/repos/${GITREPO}/tarball/${BRANCH} | ${ELEVATE} tar zx --wildcards \"*/${REPO}*/packages/*\"   --strip-components=3"}
+                            print "curl ${CURL_VERBOSITY} -L https://api.github.com/repos/${GITREPO}/tarball/${BRANCH} | ${ELEVATE} tar zx --wildcards \"*/${REPO}*/packages/*\"   --strip-components=3"}
                 ! /github/ {print "# fetching non-github repo";
                             print "tail -n +2 \"${ETC_DIR}/${REPO}.repo\" | sed \"s/^#//\" | ${ELEVATE} sort -u -o \"${ETC_DIR}/${REPO}.repo.tmp\"";\
-                            print "${ELEVATE} wget -q --show-progress --progress=bar:force:noscroll -N -B \"${REPO_URL}/packages/\" -i \"${ETC_DIR}/${REPO}.repo.tmp\" -P \"${ETC_DIR}/${REPO}.d\"";
+                            print "${ELEVATE} wget ${WGET_VERBOSITY} -N -B \"${REPO_URL}/packages/\" -i \"${ETC_DIR}/${REPO}.repo.tmp\" -P \"${ETC_DIR}/${REPO}.d\"";
                             print "${ELEVATE} rm \"${ETC_DIR}/${REPO}.repo.tmp\""
                 } '\
                 <<<${REPO_URL} | bash -
@@ -1480,14 +1490,14 @@ case "${ACTION}" in
             list_debs "" --raw | grep "${1}"
         fi;;
     update)
-        if [ -n "${1}" ] && [ "${1}" != --repos-only ]; then
+        if [ -n "${1}" ] && [ "${1}" != --repos-only ] && [ "${1}" != --quiet ]; then
             fancy_message fatal "Unknown option supplied: ${1}"
         fi
         elevate_privs
         create_cache_dir
         create_etc_dir
         init_repos
-        update_repos
+        update_repos "$@"
         if [ "${1}" != --repos-only ]; then
             APPS="$(list_local_apps)"
             APPS="${APPS}