diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a7fb082..4b67ce7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ name: Create and Publish a Docker image on: push: - branches: [ master ] + branches: [main] env: REGISTRY: ghcr.io diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2b5bb32..c1a2bf1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,9 +2,9 @@ name: Test on: push: - branches: [ master ] + branches: [main] pull_request: - branches: [ master ] + branches: [main] jobs: test: @@ -12,6 +12,6 @@ jobs: steps: - run: rustup update stable - run: wget -c https://github.com/koalaman/shellcheck/releases/download/latest/shellcheck-latest.linux.x86_64.tar.xz -O - | tar -xvJ -C /tmp/ - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: ./test run: PATH="/tmp/shellcheck-latest:$PATH" ./test diff --git a/aur b/aur index 278a72f..fcc2394 160000 --- a/aur +++ b/aur @@ -1 +1 @@ -Subproject commit 278a72f4ce2ba737722ff38267451cc91fff2861 +Subproject commit fcc23945e1c13f514fccade7127784caec5d4a54 diff --git a/completion/bash/aurto b/completion/bash/aurto index 0f284d2..99ea16c 100644 --- a/completion/bash/aurto +++ b/completion/bash/aurto @@ -17,7 +17,7 @@ _aurto() { && command -v aur >/dev/null 2>&1 then local search - search=$(aur pkglist -P "^$cur") + search=$(aur pkglist -P "^$cur" 2>/dev/null) mapfile -t COMPREPLY < <(compgen -W "$search" -- "$cur") return 0 fi diff --git a/completion/fish/aurto.fish b/completion/fish/aurto.fish index 6ff4d20..a75d483 100644 --- a/completion/fish/aurto.fish +++ b/completion/fish/aurto.fish @@ -3,7 +3,7 @@ function __aurto_complete_add set -l search (commandline -ct) if [ (string length $search) -gt 0 ] - aur pkglist -P "^$search" + aur pkglist -P "^$search" 2>/dev/null end end diff --git a/completion/zsh/_aurto b/completion/zsh/_aurto index 83438c6..30d9604 100644 --- a/completion/zsh/_aurto +++ b/completion/zsh/_aurto @@ -43,7 +43,7 @@ _aurto_available_packages () _aurto_add () { local pref=$words[$CURRENT] - _aur_packages=($(aur pkglist -P "^$pref")) + _aur_packages=($(aur pkglist -P "^$pref" 2>/dev/null)) compadd "$@" -a -- _aur_packages } diff --git a/dockerREADME.md b/dockerREADME.md index f31b57c..d9e9ec0 100644 --- a/dockerREADME.md +++ b/dockerREADME.md @@ -8,7 +8,7 @@ docker run -d --name aurto-docker \ --tmpfs /tmp --tmpfs /run --tmpfs /run/lock \ -v aurto_db:/var/cache/pacman/aurto \ -v aurto_config:/etc/aurto \ - ghcr.io/alexheretic/aurto:master + ghcr.io/alexheretic/aurto:main ``` > Make sure to replace **aurto_db** and **aurto_config** with an actual path if you don't want it to store the pacman repo and config files in a docker volume @@ -27,4 +27,4 @@ Also recommended: Add an alias to .bashrc so you only have to write aurto instea ```sh alias aurto="docker exec -it --user aurto aurto-docker aurto" -``` \ No newline at end of file +``` diff --git a/makefile b/makefile index aa752ca..bea42ca 100644 --- a/makefile +++ b/makefile @@ -5,7 +5,6 @@ all: @rm -rf target @cd trust-check && CARGO_INCREMENTAL=0 cargo build --release - @strip $(CARGO_TARGET_DIR)/release/trust-check @install -D conf/aurto.pacman.conf target/etc/pacman.d/aurto @install -Dm440 conf/50_aurto_passwordless -t target/etc/sudoers.d diff --git a/trust-check/Cargo.lock b/trust-check/Cargo.lock index 4e7830e..5526f51 100644 --- a/trust-check/Cargo.lock +++ b/trust-check/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cc" -version = "1.0.82" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "libc", ] @@ -28,9 +28,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.65+curl-8.2.1" +version = "0.4.70+curl-8.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "961ba061c9ef2fe34bbd12b807152d96f0badd2bebe7b90ce6c8c8b7572a0986" +checksum = "3c0333d8849afe78a4c8102a429a446bfdd055832af071945520e835ae2d841e" dependencies = [ "cc", "libc", @@ -38,7 +38,7 @@ dependencies = [ "openssl-sys", "pkg-config", "vcpkg", - "winapi", + "windows-sys", ] [[package]] @@ -49,9 +49,9 @@ checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "libz-sys" @@ -73,9 +73,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.91" +version = "0.9.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" +checksum = "c3eaad34cdd97d81de97964fc7f29e2d104f483840d906ef56daa1912338460b" dependencies = [ "cc", "libc", @@ -85,9 +85,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" [[package]] name = "schannel" @@ -100,9 +100,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", "winapi", @@ -155,9 +155,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -170,42 +170,42 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" diff --git a/trust-check/Cargo.toml b/trust-check/Cargo.toml index b88d7a3..918dadd 100644 --- a/trust-check/Cargo.toml +++ b/trust-check/Cargo.toml @@ -2,7 +2,7 @@ name = "trust-check" version = "0.1.0" authors = ["Alex Butler "] -edition = "2018" +edition = "2021" publish = false [dependencies] @@ -13,3 +13,4 @@ json = "0.12" lto = true panic = "abort" opt-level = "s" +strip = true