Refactor installation functions
This commit is contained in:
parent
32dfdcc6c3
commit
b1dc0b2009
6 changed files with 32 additions and 32 deletions
|
@ -1,8 +1,15 @@
|
|||
#!/bin/bash -e
|
||||
function install() {
|
||||
local dir="$(realpath "${BASH_SOURCE%/*}")";
|
||||
alias installDrivers=". ${dir@Q}/scripts/drivers.sh";
|
||||
alias initializeConfig=". ${dir@Q}/../../../scripts/Unix/Devices/Logitech G903/install.sh";
|
||||
function installDrivers() {
|
||||
. "../../../scripts/Arch/Config/SecureBoot/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;
|
||||
. "../../../scripts/Arch/OS/install.sh";
|
||||
|
|
|
@ -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;
|
|
@ -1,11 +1,24 @@
|
|||
#!/bin/bash -e
|
||||
function install() {
|
||||
local dir="$(realpath "${BASH_SOURCE%/*}")";
|
||||
alias installDrivers=". ${dir@Q}/scripts/drivers.sh";
|
||||
alias installSoftware=". ${dir@Q}/../../../scripts/Arch/Collections/school.sh";
|
||||
alias initializeConfig=". ${dir@Q}/scripts/config.sh";
|
||||
function installDrivers() {
|
||||
. "../../../scripts/Arch/Config/SecureBoot/install.sh";
|
||||
. "../../../scripts/Arch/Drivers/SurfaceBook2/install.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";
|
||||
popd > /dev/null;
|
||||
}
|
||||
|
|
|
@ -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;
|
|
@ -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;
|
|
@ -1,9 +1,10 @@
|
|||
#!/bin/bash -e
|
||||
rootDir="${BASH_SOURCE%/*}";
|
||||
customPortValhallaSudoConfigFile="/etc/sudoers.d/1337_PortValhalla"
|
||||
pushd "$rootDir" > /dev/null;
|
||||
|
||||
pushd "$rootDir" > /dev/null;
|
||||
. "../../Common/Scripts/hooks.sh";
|
||||
popd > /dev/null;
|
||||
|
||||
function autoRoot() {
|
||||
{
|
||||
|
@ -20,9 +21,11 @@ function defaultProfileSetup() {
|
|||
runHook initialize \
|
||||
autoRoot;
|
||||
|
||||
pushd "$rootDir" > /dev/null;
|
||||
. "../Software/base-devel/install.sh";
|
||||
. "../Config/pacman/install.sh";
|
||||
. "../Software/yay/install.sh";
|
||||
popd > /dev/null;
|
||||
|
||||
sudo pacman --noconfirm -Syu pacman-contrib;
|
||||
|
||||
|
@ -38,5 +41,3 @@ runHook initializeProfile \
|
|||
|
||||
runHook postInstall \
|
||||
sudo rm "$customPortValhallaSudoConfigFile" /var/db/sudo/lectured/$UID;
|
||||
|
||||
popd > /dev/null;
|
||||
|
|
Loading…
Reference in a new issue