fix owners

owners.txt

@@ -1,4 +1,5 @@
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 =======
 >>>>>>> Stashed changes
 <<<<<<< Updated upstream
@@ -12,6 +13,8 @@
 >>>>>>> Stashed changes
 =======
 >>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 128206/chonger
 128237/clicknpunch
 128244/dchide01
@@ -67,8 +70,6 @@
 132190/anodyne
 128183/anthonypimplife
 128264/svguerin3
-=======
->>>>>>> Stashed changes
 128219/hoonpark
 =======
 >>>>>>> Stashed changes

src/bkg.sh

@@ -90,6 +90,7 @@ main() {
     db_size_prev=$(get_BKG BKG_DIFF)
     [ -n "$db_size_curr" ] || db_size_curr=0
     [ -n "$db_size_prev" ] || db_size_prev=0
+    sed -i '/^<<<<<<<\|=======\|>>>>>>>/d' "$BKG_OWNERS"
 
     if [ "$BKG_MODE" -ne 2 ]; then
         if [ "$BKG_MODE" -eq 0 ] || [ "$BKG_MODE" -eq 3 ]; then

src/lib/util.sh

@@ -1,32 +1,36 @@
 #!/bin/bash
 # Backage library
 # Usage: ./lib.sh
-# Dependencies: curl, jq, sqlite3, zstd, parallel
+# Dependencies: git curl jq parallel sqlite3 sqlite3-pcre zstd libxml2-utils, yq
 # Copyright (c) ipitio
 #
 # shellcheck disable=SC1090,SC1091,SC2015,SC2034
 
-apt_install() {
-    sudo apt-get install -yqq git wget curl jq parallel sqlite3 sqlite3-pcre zstd libxml2-utils 2>/dev/null || apt-get install -yqq git wget curl jq parallel sqlite3 sqlite3-pcre zstd libxml2-utils
+sudonot() {
+    sudo "$@" >/dev/null 2>&1 || "$@"
 }
 
-if ! command -v git &>/dev/null || ! command -v wget &>/dev/null || command -v curl &>/dev/null || ! command -v jq &>/dev/null || ! command -v sqlite3 &>/dev/null || ! command -v zstd &>/dev/null || ! command -v parallel &>/dev/null || ! command -v xmllint &>/dev/null || [ ! -f /usr/lib/sqlite3/pcre.so ]; then
-    echo "Installing dependencies..."
-    if ! apt_install; then
+apt_install() {
+    apt-get install -yqq "$@" || {
         apt-get update
-        apt_install
-    fi
-fi
+        apt-get install -yqq "$@"
+    }
+}
 
-if ! yq -V | grep -q mikefarah; then
-    echo "Installing yq..."
-    sudo rm -f /usr/bin/yq 2>/dev/null || rm -f /usr/bin/yq
-    wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O yq
-    sudo mv yq /usr/bin/yq 2>/dev/null || mv yq /usr/bin/yq
-    sudo chmod +x /usr/bin/yq 2>/dev/null || chmod +x /usr/bin/yq
-fi
+yq_install() {
+    mv -f /usr/bin/yq /usr/bin/yq.bak
+    curl -sSLNZo /usr/bin/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64
+    chmod +x /usr/bin/yq
+}
+
+dep_check() {
+    echo "Verifying dependencies..."
+    apt_install git curl jq parallel sqlite3 sqlite3-pcre zstd libxml2-utils
+    yq -V | grep -q mikefarah || yq_install
+    echo "Dependencies verified!"
+}
 
-echo "Dependencies verified!"
+sudonot dep_check
 # shellcheck disable=SC2046
 source $(which env_parallel.bash)
 env_parallel --session
@@ -379,5 +383,3 @@ ytox() {
 ytoy() {
     yq -oy "$1" | sed 's/"/\\"/g' >"${1%.*}.yml"
 }
-
-echo "Backage loaded"