package_selections/**: ensure that we have an internet connection where we need it

2023-07-03 14:11:57 +02:00 · 2023-07-03 14:11:57 +02:00 · a8a62834d4
parent b8ebdffc56
commit a8a62834d4
28 changed files with 33 additions and 0 deletions
--- 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
--- 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
--- a/package_selections/desktop/icewm-fancy
+++ b/package_selections/desktop/icewm-fancy
@ -1,4 +1,5 @@
 function check {
+  [ "$INTERNET" = "down" ] && return 1
  return 0
 }

--- a/package_selections/desktop/icewm-light
+++ b/package_selections/desktop/icewm-light
@ -1,4 +1,5 @@
 function check {
+  [ "$INTERNET" = "down" ] && return 1
  return 0
 }

--- a/package_selections/desktop/openbox
+++ b/package_selections/desktop/openbox
@ -1,4 +1,5 @@
 function check {
+  [ "$INTERNET" = "down" ] && return 1
  return 0
 }

--- 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
--- 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
--- 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
 }
--- 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
--- 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
--- 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
--- 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
--- 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 {
--- 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 {
--- 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 {
--- 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
 }
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/package_selections/web/elinks
+++ b/package_selections/web/elinks
@ -1,4 +1,5 @@
 function check {
+  [ "$INTERNET" = "down" ] && return 1
  return 0
 }

--- 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
--- 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
--- 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