File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -505,7 +505,7 @@ make_packages_repo() {
505505 if printf " %s\n" " ${repopkgs[@]} " | grep -qx " ${_pkg} " ; then
506506 _pkglist_install+=(" ${_pkg} " )
507507 else
508- msg_info " ${_pkg} was not found. Install it with yay from AUR"
508+ msg_info " ${_pkg} was not found. Install it from AUR"
509509 norepopkg+=(" ${_pkg} " )
510510 fi
511511 done
@@ -529,9 +529,9 @@ make_packages_aur() {
529529 echo -e " \n# AUR packages.\n#\n" >> " ${build_dir} /packages.list"
530530 printf " %s\n" " ${_pkglist_aur[@]} " >> " ${build_dir} /packages.list"
531531
532- # prepare for yay
532+ # prepare for aur helper
533533 _cp " ${script_path} /system/aur.sh" " ${airootfs_dir} /root/aur.sh"
534- _pacstrap --asdeps --needed " go" # --asdepsをつけているのでaur.shで削除される --neededをつけているので明示的にインストールされている場合削除されない
534+ _pacstrap --asdeps --needed " go"
535535
536536 # Run aur script
537537 _run_with_pacmanconf _chroot_run " bash" " /root/aur.sh" " ${makepkg_script_args[@]} " " ${_pkglist_aur[@]} "
Original file line number Diff line number Diff line change @@ -92,6 +92,7 @@ if ! pacman -Qq "${aur_helper}" 1> /dev/null 2>&1; then
9292 # Install depends
9393 for _pkg in " ${aur_helper_depends[@]} " ; do
9494 if ! pacman -Qq " ${_pkg} " > /dev/null 2>&1 | grep -q " ${_pkg} " ; then
95+ # --asdepsをつけているのでaur.shで削除される --neededをつけているので明示的にインストールされている場合削除されない
9596 pacman -S --asdeps --needed " ${pacman_args[@]} " " ${_pkg} "
9697 remove_list+=(" ${_pkg} " )
9798 fi
You can’t perform that action at this time.
0 commit comments