manuth/PortValhalla
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Refactor installation functions

Browse source
This commit is contained in:
Manuel Thalmann 2024-07-07 20:04:05 +02:00
parent c7e20eb63a
commit 5bca2c6855
6 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
profiles/DerGeret/Arch/install.sh
View file

@ -1,8 +1,15 @@
#!/bin/bash -e #!/bin/bash -e
function install() { function install() {
local dir="$(realpath "${BASH_SOURCE%/*}")"; function installDrivers() {
alias installDrivers=". ${dir@Q}/scripts/drivers.sh"; . "../../../scripts/Arch/Config/SecureBoot/install.sh";
alias initializeConfig=". ${dir@Q}/../../../scripts/Unix/Devices/Logitech G903/install.sh"; . "../../../scripts/Arch/Software/nvidia-dkms/install.sh";
. "../../../scripts/Arch/Software/xone/install.sh";
. "../../../scripts/Arch/Software/bt-dualboot/install.sh";
}
function initializeConfig() {
. "../../../scripts/Unix/Devices/Logitech G903/install.sh";
}
pushd "$dir" > /dev/null; pushd "$dir" > /dev/null;
. "../../../scripts/Arch/OS/install.sh"; . "../../../scripts/Arch/OS/install.sh";

7
profiles/DerGeret/Arch/scripts/drivers.sh
View file

@ -1,7 +0,0 @@
#!/bin/bash
pushd "${BASH_SOURCE%/*}" > /dev/null;
. "$dir/../../../scripts/Arch/Config/SecureBoot/install.sh";
. "$dir/../../../scripts/Arch/Software/nvidia-dkms/install.sh";
. "$dir/../../../scripts/Arch/Software/xone/install.sh";
. "$dir/../../../scripts/Arch/Software/bt-dualboot/install.sh";
popd > /dev/null;

23
profiles/ManuSurface/Arch/install.sh
View file

@ -1,11 +1,24 @@
#!/bin/bash -e #!/bin/bash -e
function install() { function install() {
local dir="$(realpath "${BASH_SOURCE%/*}")"; function installDrivers() {
alias installDrivers=". ${dir@Q}/scripts/drivers.sh"; . "../../../scripts/Arch/Config/SecureBoot/install.sh";
alias installSoftware=". ${dir@Q}/../../../scripts/Arch/Collections/school.sh"; . "../../../scripts/Arch/Drivers/SurfaceBook2/install.sh";
alias initializeConfig=". ${dir@Q}/scripts/config.sh"; }
pushd "$dir" > /dev/null; function installSoftware() {
. "../../../scripts/Arch/Collections/school.sh";
}
function initializeConfig() {
. "../../../scripts/Common/Config/Steam/hidpi.sh";
. "../../../scripts/Unix/Devices/Surface Book 2/install.sh";
. "../../../scripts/Unix/Devices/Logitech G903/install.sh";
# Because, as it looks, Surface Books are fucking stupid.
. "../../../scripts/Common/Config/GRUB/verbose.sh";
}
pushd "${BASH_SOURCE%/*}" > /dev/null;
. "../../../scripts/Arch/OS/install.sh"; . "../../../scripts/Arch/OS/install.sh";
popd > /dev/null; popd > /dev/null;
} }

9
profiles/ManuSurface/Arch/scripts/config.sh
View file

@ -1,9 +0,0 @@
#!/bin/bash
pushd "${BASH_SOURCE%/*}" > /dev/null;
. "../../../scripts/Common/Config/Steam/hidpi.sh";
. "../../../scripts/Unix/Devices/Surface Book 2/install.sh";
. "../../../scripts/Unix/Devices/Logitech G903/install.sh";
# Because, as it looks, Surface Books are fucking stupid.
. "$dir/../../../scripts/Common/Config/GRUB/verbose.sh";
popd > /dev/null;

5
profiles/ManuSurface/Arch/scripts/drivers.sh
View file

@ -1,5 +0,0 @@
#!/bin/bash
pushd "${BASH_SOURCE%/*}" > /dev/null;
. "../../../scripts/Arch/Config/SecureBoot/install.sh";
. "../../../scripts/Arch/Drivers/SurfaceBook2/install.sh";
popd > /dev/null;

7
scripts/Arch/OS/install.sh
View file

@ -1,9 +1,10 @@
#!/bin/bash -e #!/bin/bash -e
rootDir="${BASH_SOURCE%/*}"; rootDir="${BASH_SOURCE%/*}";
customPortValhallaSudoConfigFile="/etc/sudoers.d/1337_PortValhalla" customPortValhallaSudoConfigFile="/etc/sudoers.d/1337_PortValhalla"
pushd "$rootDir" > /dev/null;
pushd "$rootDir" > /dev/null;
. "../../Common/Scripts/hooks.sh"; . "../../Common/Scripts/hooks.sh";
popd > /dev/null;
function autoRoot() { function autoRoot() {
{ {
@ -20,9 +21,11 @@ function defaultProfileSetup() {
runHook initialize \ runHook initialize \
autoRoot; autoRoot;
pushd "$rootDir" > /dev/null;
. "../Software/base-devel/install.sh"; . "../Software/base-devel/install.sh";
. "../Config/pacman/install.sh"; . "../Config/pacman/install.sh";
. "../Software/yay/install.sh"; . "../Software/yay/install.sh";
popd > /dev/null;
sudo pacman --noconfirm -Syu pacman-contrib; sudo pacman --noconfirm -Syu pacman-contrib;
@ -38,5 +41,3 @@ runHook initializeProfile \
runHook postInstall \ runHook postInstall \
sudo rm "$customPortValhallaSudoConfigFile" /var/db/sudo/lectured/$UID; sudo rm "$customPortValhallaSudoConfigFile" /var/db/sudo/lectured/$UID;
popd > /dev/null;