From 936f477cb1197ef13307b0b6b8896a6441d938bc Mon Sep 17 00:00:00 2001
From: eichehome <eichehome@gmx.de>
Date: Sun, 2 Apr 2023 21:45:22 +0200
Subject: [PATCH] Exposed Defaults for Root, nutzername and nutzerpasswort

---
 base.sh                      | 24 ++++++++++++++----------
 prep-BTRFS-UEFI-Encrypted.sh | 10 ++++------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/base.sh b/base.sh
index a462484..825f742 100644
--- a/base.sh
+++ b/base.sh
@@ -87,21 +87,21 @@ done
 #  exit 1
 #fi
 
-read -r -p "Passwort für Root :" rootpw
+read -r -p "Passwort für Root (Default: test) :" rootpw
 : "${rootpw:=test}"
 if [[ $rootpw == "" ]]; then
   echo "Kein Passwort für Root vergeben, breche ab"
   exit 1
 fi
 
-read -r -p "Nutzername: " nutzername
+read -r -p "Nutzername (Default: eichehome): " nutzername
 : "${nutzername:=eichehome}"
 if [[ $nutzername == "" ]]; then
   echo "Kein Nutzername eingegeben, breche ab"
   exit 1
 fi
 
-read -r -p "Passwort für $nutzername: " nutzerpw
+read -r -p "Passwort für $nutzername (Default: testen): " nutzerpw
 : "${nutzerpw:=testen}"
 if [[ $rootpw == "" ]]; then
   echo "Kein Passwort für $nutzername vergeben, breche ab"
@@ -190,26 +190,27 @@ if [[ $configuration == 1 ]]; then
   # Ethernet
   echo "Ethernet"
   #ethernet_network=$(find / -type f -name 20-ethernet.network | grep configs)
-  cp "$(find "${PWD}" -type f -name )" /etc/systemd/network/
+  cp "$(find "${PWD}" -type f -name 20-ethernet.network)" /etc/systemd/network/
   # Wlan
   echo "WLAN"
   #wlan_network=$(find / -type f -name 20-wlan.network | grep configs)
-  cp "$(find "${PWD}" -type f -name )" /etc/systemd/network/
+  cp "$(find "${PWD}" -type f -name 20-wlan.network)" /etc/systemd/network/
   # Wwan (Mobilefunk)
   echo "Mobilfunk"
   #wwan_network=$(find / -type f -name 20-wwan.network | grep configs)
-  cp "$(find "${PWD}" -type f -name )" /etc/systemd/network/
+  cp "$(find "${PWD}" -type f -name 20-wwan.network)" /etc/systemd/network/
 elif [[ $configuration == 2 ]]; then
-  pacman -S gnome gdm fwupd networkmanager modemmanager avahi bluez bluez-utils sshfs pipewire pipewire-audio pipewire-alsa pipewire-pulse pipewire-jack pipewire-zeroconf pipewire-v4l2 wireplumber gstreamer gst-plugin-pipewire gst-libav gst-plugins-good gst-plugins-base gst-plugins-vaapi gnome-software-packagekit-plugin xdg-desktop-portal-gnome festival networkmanager-openconnect networkmanager-openvpn networkmanager-pptp networkmanager-vpnc power-profiles-daemon
+  pacman -S fwupd networkmanager modemmanager avahi bluez bluez-utils sshfs pipewire pipewire-audio pipewire-alsa pipewire-pulse pipewire-jack pipewire-zeroconf pipewire-v4l2 wireplumber gstreamer gst-plugin-pipewire gst-libav gst-plugins-good gst-plugins-base gst-plugins-vaapi gnome-software-packagekit-plugin xdg-desktop-portal-gnome festival networkmanager-openconnect networkmanager-openvpn networkmanager-pptp networkmanager-vpnc power-profiles-daemon
+  pacman -S gnome gdm
 
   systemctl enable NetworkManager
   # Configure IWD as Backend for Networkmanager
   #wifi_backend_conf=$(find / -type f -name wifi_backend.conf | grep configs)
-  cp "$(find "${PWD}" -type f -name )" /etc/NetworkManager/conf.d/
+  cp "$(find "${PWD}" -type f -name wifi_backend.conf)" /etc/NetworkManager/conf.d/
   # Disable MulticastDNS in systemd-resolved
   #disable_multicastDNS_conf=$(find / -type f -name disable-multicastDNS.conf | grep configs)
   mkdir -p /etc/systemd/resolved.conf.d
-  cp "$(find "${PWD}" -type f -name )" /etc/systemd/resolved.conf.d/
+  cp "$(find "${PWD}" -type f -name disable-multicastDNS.conf)" /etc/systemd/resolved.conf.d/
   systemctl enable avahi-daemon
 fi
 
@@ -252,8 +253,11 @@ fi
 bootctl install
 
 # Bootloaderconfig
+scriptpfad="${PWD}-${0}"
+scriptpfad="${scriptpfad//-.}"
+scriptpfad="${scriptpfad//base.sh}"
 #loader_conf=$(find / -type f -name loader.conf | grep configs)
-cp "$(find "${PWD}" -type f -name loader.conf)" /boot/loader/
+cp "$(find "${scriptpfad}" -type f -name loader.conf)" /boot/loader/
 
 #$selectedKernel="linux linux-lts linux-zen"
 entry_conf=$(find "${PWD}" -type f -name entry.conf)
diff --git a/prep-BTRFS-UEFI-Encrypted.sh b/prep-BTRFS-UEFI-Encrypted.sh
index 50ac4dc..d724578 100644
--- a/prep-BTRFS-UEFI-Encrypted.sh
+++ b/prep-BTRFS-UEFI-Encrypted.sh
@@ -1,10 +1,8 @@
 #!/bin/bash
-
-#variable=$(dialog --title "" 3>&1 1>&2 2>&3 3>&-)
-
-#pacman -S dialog
-#device_to_install_to=$(dialog --title "Device" --inputbox "Write the Path to the device to install to (eg. /dev/vda)" 3>&1 1>&2 2>&3 3>&-)
-
+# iwctl station wlan0 get-networks
+# iwctl station wlan0 connect"<SSID>"
+# ip addr
+# curl -O https://git.sp-codes.de/eichehome/archinstall/raw/branch/main/prep-BTRFS-UEFI-Encrypted.sh
 localectl set-keymap de-latin1-nodeadkeys
 
 timedatectl set-timezone Europe/Berlin