diff --git a/aur b/aur index 4d87c4d..0d3425c 160000 --- a/aur +++ b/aur @@ -1 +1 @@ -Subproject commit 4d87c4d557cc420e2000c48eefa621c71da4e91c +Subproject commit 0d3425cb31ba1f14ae838828d03976ea49b13138 diff --git a/bin/aurto b/bin/aurto index 7aee11f..309bea0 100755 --- a/bin/aurto +++ b/bin/aurto @@ -12,7 +12,7 @@ if [[ $EUID -eq 0 ]]; then user=$(cat /usr/lib/aurto/user) exec sudo -u "$user" "$0" "$@" else - echo "aurto not intialised. Run $(green aurto init) as a non-root user" + echo "aurto not initialised. Run $(green aurto init) as a non-root user" exit 1 fi fi @@ -23,7 +23,7 @@ lib_dir="$bin_dir/../lib/aurto" source "$lib_dir/shared-functions" if [[ $command != "init" ]] && ! initialised; then - echo "aurto not intialised. Run $(green aurto init)" + echo "aurto not initialised. Run $(green aurto init)" exit 1 fi @@ -133,17 +133,19 @@ if [ "$command" == "add" ] && [ -n "$arg1" ]; then elif [ "$command" == "addpkg" ] && [ -n "$arg1" ]; then check_new_package_trust "${@:2}" - echo "aurto: Running: $(dim repo-add /var/cache/pacman/aurto/aurto.db.tar) $(cyan "${*:2}")" >&2 - repo-add /var/cache/pacman/aurto/aurto.db.tar "${@:2}" + db_tar_path=$(readlink -f /var/cache/pacman/aurto/aurto.db) + echo "aurto: Running: $(dim repo-add "$db_tar_path") $(cyan "${*:2}")" >&2 + repo-add "$db_tar_path" "${@:2}" for pkg in "${@:2}"; do cp "$pkg" /var/cache/pacman/aurto/ done aurto_sync elif [ "$command" == "remove" ] && [ -n "$arg1" ]; then + db_tar_path=$(readlink -f /var/cache/pacman/aurto/aurto.db) removed="" for pkg in "${@:2}"; do - if remove_out=$(repo-remove /var/cache/pacman/aurto/aurto.db.tar "$pkg" 2>&1); then + if remove_out=$(repo-remove "$db_tar_path" "$pkg" 2>&1); then if [[ $remove_out = *"ERROR"* ]]; then # may no longer be necessary as repo-remove seems to exit non-zero in this case echo "aurto: $(cyan "$pkg") $(red not found)" >&2 diff --git a/lib/aurto/install b/lib/aurto/install index 4dcfb62..095b850 100755 --- a/lib/aurto/install +++ b/lib/aurto/install @@ -26,7 +26,8 @@ init() { chmod 700 /usr/lib/aurto/user install -d /var/cache/pacman/aurto -o "$user" - sudo -u "$user" repo-add /var/cache/pacman/aurto/aurto.db.tar 2>/dev/null + sudo -u "$user" tar acf /var/cache/pacman/aurto/aurto.db.tar.zst -T /dev/null + sudo -u "$user" ln -rsf /var/cache/pacman/aurto/aurto.db{.tar.zst,} if ! test -f /etc/aurto/trusted-users; then echo 'aurto: Adding default trusted users -> /etc/aurto/trusted-users' >&2 @@ -94,4 +95,4 @@ elif [[ $command == "remove" ]]; then else echo "unknown command: $command" >&2 exit 1 -fi \ No newline at end of file +fi diff --git a/trust-check/Cargo.lock b/trust-check/Cargo.lock index 9203470..1c006ae 100644 --- a/trust-check/Cargo.lock +++ b/trust-check/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cc" -version = "1.0.90" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41" [[package]] name = "curl"