diff --git a/src/etc/portage/repos.conf/eselect-repo.conf b/src/etc/portage/repos.conf/eselect-repo.conf new file mode 100644 index 0000000..d30dfae --- /dev/null +++ b/src/etc/portage/repos.conf/eselect-repo.conf @@ -0,0 +1,16 @@ +# created by eselect-repo + +[nez] +location = /var/db/repos/nezbednik-overlay +sync-type = git +sync-uri = https://codeberg.org/nezbednik/repo + +[speedie-overlay] +location = /var/db/repos/speedie-overlay +sync-type = git +sync-uri = https://codeberg.org/speedie/speedie-overlay + +[steam-overlay] +location = /var/db/repos/steam-overlay +sync-type = git +sync-uri = https://github.com/anyc/steam-overlay diff --git a/src/setup-pkgs.sh b/src/setup-pkgs.sh index 3fe8c80..530efc5 100755 --- a/src/setup-pkgs.sh +++ b/src/setup-pkgs.sh @@ -3,7 +3,7 @@ # install packages if [ -e "pkglist" ]; then - emerge --noreplace --verbose $(cat pkglist) + emerge --noreplace --verbose --keep-going $(cat pkglist) exit 0 else echo "No pkglist found." diff --git a/src/setup.sh b/src/setup.sh index c21d9d8..c50faa0 100755 --- a/src/setup.sh +++ b/src/setup.sh @@ -71,6 +71,10 @@ if [ -e "etc/portage/package.unmask" ]; then cp etc/portage/package.unmask /etc/portage/package.unmask fi +if [ -d "/etc/portage/repos.conf" ] && [ -e "etc/portage/repos.conf/eselect-repo.conf" ]; then + cp etc/portage/repos.conf/eselect-repo.conf /etc/portage/repos.conf/eselect-repo.conf +fi + echo "NOTE: This make.conf has options by default that are very host specific." echo "Edit it to match your system. I have commented lines for all my computers (ThinkPad X220, my desktop and virtual machines) that you can just uncomment." echo "For kernel, see my other repositories." diff --git a/src/update-world.sh b/src/update-world.sh index ca20864..d8d6b55 100755 --- a/src/update-world.sh +++ b/src/update-world.sh @@ -1,2 +1,7 @@ #!/bin/sh -emerge --ask --deep --update --newuse --verbose @world + +if [ -e "/etc/portage/repos.conf/eselect-repo.conf" ]; then + command -v emaint > /dev/null && emaint sync -A +fi + +emerge --ask --deep --update --newuse --verbose --keep-going @world diff --git a/src/updatedots.sh b/src/updatedots.sh index c796d8a..b6da5f8 100755 --- a/src/updatedots.sh +++ b/src/updatedots.sh @@ -2,31 +2,35 @@ # updatedots if [ -f "/etc/portage/make.conf" ]; then - cp /etc/portage/make.conf etc/portage/make.conf && echo "Updated make.conf (1/7)" + cp /etc/portage/make.conf etc/portage/make.conf && echo "Updated make.conf (1/8)" fi if [ -f "/etc/portage/package.use" ]; then - cp /etc/portage/package.use etc/portage/package.use && echo "Updated package.use (2/7)" + cp /etc/portage/package.use etc/portage/package.use && echo "Updated package.use (2/8)" fi if [ -f "/etc/portage/package.license" ]; then - cp /etc/portage/package.license etc/portage/package.license && echo "Updated package.license (3/7)" + cp /etc/portage/package.license etc/portage/package.license && echo "Updated package.license (3/8)" fi if [ -f "/etc/portage/package.accept_keywords" ]; then - cp /etc/portage/package.accept_keywords etc/portage/package.accept_keywords && echo "Updated package.accept_keywords (4/7)" + cp /etc/portage/package.accept_keywords etc/portage/package.accept_keywords && echo "Updated package.accept_keywords (4/8)" fi if [ -f "/etc/portage/package.mask" ]; then - cp /etc/portage/package.mask etc/portage/package.mask && echo "Updated package.mask (5/7)" + cp /etc/portage/package.mask etc/portage/package.mask && echo "Updated package.mask (5/8)" fi if [ -f "/etc/portage/package.unmask" ]; then - cp /etc/portage/package.unmask etc/portage/package.unmask && echo "Updated package.unmask (6/7)" + cp /etc/portage/package.unmask etc/portage/package.unmask && echo "Updated package.unmask (6/8)" fi if [ -f "/var/lib/portage/world" ]; then - cp /var/lib/portage/world var/lib/portage/world && echo "Updated world (7/7)" + cp /var/lib/portage/world var/lib/portage/world && echo "Updated world (7/8)" +fi + +if [ -f "/etc/portage/repos.conf/eselect-repo.conf" ]; then + cp /etc/portage/repos.conf/eselect-repo.conf etc/portage/repos.conf/eselect-repo.conf && echo "Updated eselect-repo (8/8)" fi echo "Complete!"