Browse Source

Merge remote-tracking branch 'origin/master' into develop

QMK Bot 1 week ago
parent
commit
d5582b3e9d
2 changed files with 2 additions and 2 deletions
  1. 1 1
      .github/workflows/bootstrap_testing.yml
  2. 1 1
      util/env-bootstrap.sh

+ 1 - 1
.github/workflows/bootstrap_testing.yml

@@ -99,7 +99,7 @@ jobs:
                   zypper --non-interactive install sudo git shadow findutils tar  # findutils=xargs
                   ;;
                 *gentoo*)
-                  emerge-webrsync
+                  emaint sync
                   emerge --noreplace --ask=n sudo dev-vcs/git shadow findutils  # findutils=xargs
                   ;;
                 *archlinux*|*cachyos*|*manjaro*)

+ 1 - 1
util/env-bootstrap.sh

@@ -359,7 +359,7 @@ __EOT__
             *gentoo*)
                 echo "It will also install the following system packages using 'emerge':" >&2
                 print_package_manager_deps_and_delay
-                $(nsudo) emerge-webrsync
+                $(nsudo) emaint sync
                 $(nsudo) emerge --noreplace --ask=n $(get_package_manager_deps | tr ' ' '\n') || signal_execution_failure
                 exit_if_execution_failed
                 ;;