From 2b9540019a26b5fed441ff85511389531dd7791a Mon Sep 17 00:00:00 2001
From: David P <megver83@parabola.nu>
Date: Sat, 1 Aug 2020 20:13:26 -0400
Subject: [talkingparabola] sync with releng, talkingarch is just too slow ;)

talkingarch last synced archiso in v44, but releng has changed a lot since then

Signed-off-by: David P <megver83@parabola.nu>
---
 .../airootfs/usr/bin/livecd-alsa-unmuter           |  4 ++++
 .../talkingparabola/airootfs/usr/bin/pick-a-card   |  9 ++++---
 .../airootfs/usr/local/bin/Installation_guide      |  5 ++++
 .../airootfs/usr/local/bin/choose-mirror           | 28 ++++++++++++++++++++++
 4 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100755 configs/talkingparabola/airootfs/usr/local/bin/Installation_guide
 create mode 100755 configs/talkingparabola/airootfs/usr/local/bin/choose-mirror

(limited to 'configs/talkingparabola/airootfs/usr')

diff --git a/configs/talkingparabola/airootfs/usr/bin/livecd-alsa-unmuter b/configs/talkingparabola/airootfs/usr/bin/livecd-alsa-unmuter
index 6de05a0..2a0d814 100755
--- a/configs/talkingparabola/airootfs/usr/bin/livecd-alsa-unmuter
+++ b/configs/talkingparabola/airootfs/usr/bin/livecd-alsa-unmuter
@@ -1,7 +1,11 @@
 #!/bin/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # Properly initialize the sound card so that we have audio at boot.
 # This script is released under the GNU General Public License.
+
+# shellcheck disable=SC1091
 source /usr/share/livecd-sound/functions
 
 preinit_levels all
diff --git a/configs/talkingparabola/airootfs/usr/bin/pick-a-card b/configs/talkingparabola/airootfs/usr/bin/pick-a-card
index 7f469e8..10f2f79 100755
--- a/configs/talkingparabola/airootfs/usr/bin/pick-a-card
+++ b/configs/talkingparabola/airootfs/usr/bin/pick-a-card
@@ -1,9 +1,12 @@
 #!/bin/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 # If there are multiple usable sound cards, prompt the user to choose one,
 # using auditory feedback.
 # This script is released under the GNU General Public License.
 
+# shellcheck disable=SC1091
 source /usr/share/livecd-sound/functions
 
 nwords() {
@@ -12,7 +15,7 @@ nwords() {
 
 is_numeric() {
 	local str=$1
-	expr match "$str" '[[:digit:]]\+$' > /dev/null 2>&1
+	expr "$str" : '[[:digit:]]\+$' > /dev/null 2>&1
 }
 
 set_default_card() {
@@ -28,7 +31,7 @@ play_on_card() {
 
 set -f
 usable_cards="$(list_non_pcsp_cards)"
-num_usable_cards=$(nwords $usable_cards)
+num_usable_cards=$(nwords "$usable_cards")
 
 if [ "$num_usable_cards" -eq 1 ]; then
 	exit 0
@@ -47,7 +50,7 @@ for card in $usable_cards; do
 		continue
 	fi
 	play_on_card "$card" /usr/share/livecd-sound/sounds/beep.wav
-	if read -t 10; then
+	if read -rt 10; then
 		set_default_card "$card"
 		break
 	fi
diff --git a/configs/talkingparabola/airootfs/usr/local/bin/Installation_guide b/configs/talkingparabola/airootfs/usr/local/bin/Installation_guide
new file mode 100755
index 0000000..876fbd2
--- /dev/null
+++ b/configs/talkingparabola/airootfs/usr/local/bin/Installation_guide
@@ -0,0 +1,5 @@
+#!/bin/sh
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+exec lynx 'https://wiki.parabola.nu/Installation_Guide'
diff --git a/configs/talkingparabola/airootfs/usr/local/bin/choose-mirror b/configs/talkingparabola/airootfs/usr/local/bin/choose-mirror
new file mode 100755
index 0000000..e8f8254
--- /dev/null
+++ b/configs/talkingparabola/airootfs/usr/local/bin/choose-mirror
@@ -0,0 +1,28 @@
+#!/bin/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+get_cmdline() {
+    local param
+    for param in $(< /proc/cmdline); do
+        case "${param}" in
+            $1=*) echo "${param##*=}";
+            return 0
+            ;;
+        esac
+    done
+}
+
+mirror=$(get_cmdline mirror)
+[[ $mirror = auto ]] && mirror=$(get_cmdline parabolaiso_http_srv)
+[[ $mirror ]] || exit 0
+
+mv /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.orig
+cat >/etc/pacman.d/mirrorlist << EOF
+#
+# Parabola GNU/Linux-libre repository mirrorlist
+# Generated by parabolaiso
+#
+
+Server = ${mirror%%/}/\$repo/os/\$arch
+EOF
-- 
cgit v1.2.2