From a8a62834d42cf42a4657b8ec9ed5d4d74dcf606c Mon Sep 17 00:00:00 2001
From: BodgeMaster <>
Date: Mon, 3 Jul 2023 14:11:57 +0200
Subject: [PATCH] package_selections/**: ensure that we have an internet
 connection where we need it

---
 package_selections/audio/pipewire                         | 1 +
 package_selections/audio/pipewire-slim                    | 1 +
 package_selections/desktop/icewm-fancy                    | 1 +
 package_selections/desktop/icewm-light                    | 1 +
 package_selections/desktop/openbox                        | 1 +
 package_selections/extras/all                             | 1 +
 package_selections/extras/all-no-minecraft                | 1 +
 package_selections/extras/desktop-backgrounds             | 3 +++
 package_selections/extras/minecraft                       | 1 +
 package_selections/extras/minesweeper                     | 1 +
 package_selections/extras/snake                           | 1 +
 package_selections/multimedia/vlc                         | 1 +
 package_selections/nvidia/nvidia                          | 2 ++
 package_selections/nvidia/nvidia390                       | 2 ++
 package_selections/nvidia/nvidia470                       | 2 ++
 package_selections/pre-configure/bashrc                   | 1 +
 package_selections/systray/network                        | 1 +
 package_selections/systray/network-and-audio              | 1 +
 package_selections/terminal/lxterminal                    | 1 +
 package_selections/terminal/xterm                         | 1 +
 package_selections/utilities/desktop-integrated-guisysmon | 1 +
 package_selections/utilities/desktop-integrated-htop      | 1 +
 package_selections/utilities/xfe-guisysmon                | 1 +
 package_selections/utilities/xfe-htop                     | 1 +
 package_selections/web/elinks                             | 1 +
 package_selections/web/evil                               | 1 +
 package_selections/web/firefox                            | 1 +
 package_selections/web/firefox-esr                        | 1 +
 28 files changed, 33 insertions(+)

diff --git a/package_selections/audio/pipewire b/package_selections/audio/pipewire
index 239e75d..7a79d04 100644
--- a/package_selections/audio/pipewire
+++ b/package_selections/audio/pipewire
@@ -1,4 +1,5 @@
 function check {
+  [ "$INTERNET" = "down" ] && return 1
   if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
     return 1
   else
diff --git a/package_selections/audio/pipewire-slim b/package_selections/audio/pipewire-slim
index 002b2d5..1df84fd 100644
--- a/package_selections/audio/pipewire-slim
+++ b/package_selections/audio/pipewire-slim
@@ -1,4 +1,5 @@
 function check {
+  [ "$INTERNET" = "down" ] && return 1
   if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
     return 1
   else
diff --git a/package_selections/desktop/icewm-fancy b/package_selections/desktop/icewm-fancy
index f56871a..44cbee7 100644
--- a/package_selections/desktop/icewm-fancy
+++ b/package_selections/desktop/icewm-fancy
@@ -1,4 +1,5 @@
 function check {
+  [ "$INTERNET" = "down" ] && return 1
   return 0
 }
 
diff --git a/package_selections/desktop/icewm-light b/package_selections/desktop/icewm-light
index dbec550..ec68999 100644
--- a/package_selections/desktop/icewm-light
+++ b/package_selections/desktop/icewm-light
@@ -1,4 +1,5 @@
 function check {
+  [ "$INTERNET" = "down" ] && return 1
   return 0
 }
 
diff --git a/package_selections/desktop/openbox b/package_selections/desktop/openbox
index 80e9259..dd20e69 100644
--- a/package_selections/desktop/openbox
+++ b/package_selections/desktop/openbox
@@ -1,4 +1,5 @@
 function check {
+  [ "$INTERNET" = "down" ] && return 1
   return 0
 }
 
diff --git a/package_selections/extras/all b/package_selections/extras/all
index a11980d..dc6a7bb 100644
--- a/package_selections/extras/all
+++ b/package_selections/extras/all
@@ -1,4 +1,5 @@
 function check {
+  [ "$INTERNET" = "down" ] && return 1
   if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
     return 1
   else
diff --git a/package_selections/extras/all-no-minecraft b/package_selections/extras/all-no-minecraft
index 0dce73a..10e885b 100644
--- a/package_selections/extras/all-no-minecraft
+++ b/package_selections/extras/all-no-minecraft
@@ -1,4 +1,5 @@
 function check {
+  [ "$INTERNET" = "down" ] && return 1
   if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
     return 1
   else
diff --git a/package_selections/extras/desktop-backgrounds b/package_selections/extras/desktop-backgrounds
index 17b92bb..7705283 100644
--- a/package_selections/extras/desktop-backgrounds
+++ b/package_selections/extras/desktop-backgrounds
@@ -1,4 +1,5 @@
 function check {
+  [ "$INTERNET" = "down" ] && return 1
   if grep "desktop/icewm" /tmp/stage-2-choices >/dev/null 2>&1; then
     return 0
   else
@@ -11,6 +12,8 @@ DESCRIPTION="Add some desktop backgrounds and randomly choose one on login"
 PACKAGES=""
 
 function post_install {
+  # TODO: install wget
   # TODO: configure
+  # TODO: remove wget
   echo "extras/desktop-backgrounds" >> /tmp/stage-2-choices
 }
diff --git a/package_selections/extras/minecraft b/package_selections/extras/minecraft
index d458592..2b89841 100644
--- a/package_selections/extras/minecraft
+++ b/package_selections/extras/minecraft
@@ -1,4 +1,5 @@
 function check {
+  [ "$INTERNET" = "down" ] && return 1
   if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
     return 1
   else
diff --git a/package_selections/extras/minesweeper b/package_selections/extras/minesweeper
index f7e4c54..8f85baf 100644
--- a/package_selections/extras/minesweeper
+++ b/package_selections/extras/minesweeper
@@ -1,4 +1,5 @@
 function check {
+  [ "$INTERNET" = "down" ] && return 1
   if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
     return 1
   else
diff --git a/package_selections/extras/snake b/package_selections/extras/snake
index f5ba485..0932a53 100644
--- a/package_selections/extras/snake
+++ b/package_selections/extras/snake
@@ -1,4 +1,5 @@
 function check {
+  [ "$INTERNET" = "down" ] && return 1
   if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
     return 1
   else
diff --git a/package_selections/multimedia/vlc b/package_selections/multimedia/vlc
index badb744..144282d 100644
--- a/package_selections/multimedia/vlc
+++ b/package_selections/multimedia/vlc
@@ -1,4 +1,5 @@
 function check {
+  [ "$INTERNET" = "down" ] && return 1
   if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
     return 1
   else
diff --git a/package_selections/nvidia/nvidia b/package_selections/nvidia/nvidia
index 26e9911..67d91ff 100644
--- a/package_selections/nvidia/nvidia
+++ b/package_selections/nvidia/nvidia
@@ -1,4 +1,5 @@
 function check {
+  [ "$INTERNET" = "down" ] && return 1
   if xbps-query glibc >/dev/null 2>&1; then
     return 0
   else
@@ -9,6 +10,7 @@ function check {
 DESCRIPTION="Latest Nvidia driver, supports GTX ??? series and up"
 
 #TODO: optimus support?
+#TODO: void-repo-nonfree
 PACKAGES="nvidia"
 
 function post_install {
diff --git a/package_selections/nvidia/nvidia390 b/package_selections/nvidia/nvidia390
index 930b243..ddb54ca 100644
--- a/package_selections/nvidia/nvidia390
+++ b/package_selections/nvidia/nvidia390
@@ -1,4 +1,5 @@
 function check {
+  [ "$INTERNET" = "down" ] && return 1
   if xbps-query glibc >/dev/null 2>&1; then
     return 0
   else
@@ -9,6 +10,7 @@ function check {
 DESCRIPTION="Legacy Nvidia driver, version 390, supports GTX ??? series"
 
 #TODO: Optimus support?
+#TODO: void-repo-nonfree
 PACKAGES="nvidia390"
 
 function post_install {
diff --git a/package_selections/nvidia/nvidia470 b/package_selections/nvidia/nvidia470
index db95f1f..7ebb9b3 100644
--- a/package_selections/nvidia/nvidia470
+++ b/package_selections/nvidia/nvidia470
@@ -1,4 +1,5 @@
 function check {
+  [ "$INTERNET" = "down" ] && return 1
   if xbps-query glibc >/dev/null 2>&1; then
     return 0
   else
@@ -9,6 +10,7 @@ function check {
 DESCRIPTION="Legacy Nvidia driver, version 470, supports GTX ??? series"
 
 #TODO: optimus support?
+#TODO: void-repo-nonfree
 PACKAGES="nvidia470"
 
 function post_install {
diff --git a/package_selections/pre-configure/bashrc b/package_selections/pre-configure/bashrc
index 2a069de..285d8b9 100644
--- a/package_selections/pre-configure/bashrc
+++ b/package_selections/pre-configure/bashrc
@@ -8,6 +8,7 @@ PACKAGES=""
 
 function post_install {
   #TODO: configure things
+  # (probably by barfing the bashrc using echo)
 
   echo "pre-configure/bashrc" >> /tmp/stage-2-choices
 }
diff --git a/package_selections/systray/network b/package_selections/systray/network
index 1211514..2f5a609 100644
--- a/package_selections/systray/network
+++ b/package_selections/systray/network
@@ -1,4 +1,5 @@
 function check {
+  [ "$INTERNET" = "down" ] && return 1
   if grep "desktop/icewm" /tmp/stage-2-choices >/dev/null 2>&1; then
     if grep "audio/none" /tmp/stage-2-choices >/dev/null 2>&1; then
       return 0
diff --git a/package_selections/systray/network-and-audio b/package_selections/systray/network-and-audio
index 3b33f8f..c8d0229 100644
--- a/package_selections/systray/network-and-audio
+++ b/package_selections/systray/network-and-audio
@@ -1,4 +1,5 @@
 function check {
+  [ "$INTERNET" = "down" ] && return 1
   if grep "desktop/icewm" /tmp/stage-2-choices >/dev/null 2>&1; then
     if grep "audio/none" /tmp/stage-2-choices >/dev/null 2>&1; then
       return 1
diff --git a/package_selections/terminal/lxterminal b/package_selections/terminal/lxterminal
index 33816b1..0834ef9 100644
--- a/package_selections/terminal/lxterminal
+++ b/package_selections/terminal/lxterminal
@@ -1,4 +1,5 @@
 function check {
+  [ "$INTERNET" = "down" ] && return 1
   if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
     return 1
   else
diff --git a/package_selections/terminal/xterm b/package_selections/terminal/xterm
index bc46ba7..38849b4 100644
--- a/package_selections/terminal/xterm
+++ b/package_selections/terminal/xterm
@@ -1,4 +1,5 @@
 function check {
+  [ "$INTERNET" = "down" ] && return 1
   if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
     return 1
   else
diff --git a/package_selections/utilities/desktop-integrated-guisysmon b/package_selections/utilities/desktop-integrated-guisysmon
index b03078b..7eca643 100644
--- a/package_selections/utilities/desktop-integrated-guisysmon
+++ b/package_selections/utilities/desktop-integrated-guisysmon
@@ -1,4 +1,5 @@
 function check {
+  [ "$INTERNET" = "down" ] && return 1
   if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
     return 1
   else
diff --git a/package_selections/utilities/desktop-integrated-htop b/package_selections/utilities/desktop-integrated-htop
index bfdb6c9..5d2b444 100644
--- a/package_selections/utilities/desktop-integrated-htop
+++ b/package_selections/utilities/desktop-integrated-htop
@@ -1,4 +1,5 @@
 function check {
+  [ "$INTERNET" = "down" ] && return 1
   if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
     return 1
   else
diff --git a/package_selections/utilities/xfe-guisysmon b/package_selections/utilities/xfe-guisysmon
index c4b6d75..4b3bd82 100644
--- a/package_selections/utilities/xfe-guisysmon
+++ b/package_selections/utilities/xfe-guisysmon
@@ -1,4 +1,5 @@
 function check {
+  [ "$INTERNET" = "down" ] && return 1
   if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
     return 1
   else
diff --git a/package_selections/utilities/xfe-htop b/package_selections/utilities/xfe-htop
index 5b8b578..0eefdab 100644
--- a/package_selections/utilities/xfe-htop
+++ b/package_selections/utilities/xfe-htop
@@ -1,4 +1,5 @@
 function check {
+  [ "$INTERNET" = "down" ] && return 1
   if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
     return 1
   else
diff --git a/package_selections/web/elinks b/package_selections/web/elinks
index 0149b86..270f3dd 100644
--- a/package_selections/web/elinks
+++ b/package_selections/web/elinks
@@ -1,4 +1,5 @@
 function check {
+  [ "$INTERNET" = "down" ] && return 1
   return 0
 }
 
diff --git a/package_selections/web/evil b/package_selections/web/evil
index d0847ce..87b27cc 100644
--- a/package_selections/web/evil
+++ b/package_selections/web/evil
@@ -1,4 +1,5 @@
 function check {
+  [ "$INTERNET" = "down" ] && return 1
   if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
     return 1
   else
diff --git a/package_selections/web/firefox b/package_selections/web/firefox
index ff44806..3973348 100644
--- a/package_selections/web/firefox
+++ b/package_selections/web/firefox
@@ -1,4 +1,5 @@
 function check {
+  [ "$INTERNET" = "down" ] && return 1
   if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
     return 1
   else
diff --git a/package_selections/web/firefox-esr b/package_selections/web/firefox-esr
index 88827c6..ab15bde 100644
--- a/package_selections/web/firefox-esr
+++ b/package_selections/web/firefox-esr
@@ -1,4 +1,5 @@
 function check {
+  [ "$INTERNET" = "down" ] && return 1
   if grep "desktop/none" /tmp/stage-2-choices >/dev/null 2>&1; then
     return 1
   else