From c4250cd27d2dc2ddb953a34dd637067d6981d353 Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Fri, 1 Nov 2024 13:12:16 +0100 Subject: [PATCH] Restructure the script directory --- archiso/scripts/build.fish | 4 +-- scripts/Arch/Config/SecureBoot/main.fish | 4 +-- scripts/Arch/Drivers/Surface/main.fish | 2 +- scripts/Arch/Drivers/SurfaceBook2/main.fish | 2 +- scripts/Arch/OS/install.fish | 8 ++--- scripts/Arch/OS/setup.fish | 6 ++-- scripts/Arch/Software/aliae/main.fish | 2 +- scripts/Arch/Software/base-devel/main.fish | 2 +- scripts/Arch/Software/brave/main.fish | 2 +- scripts/Arch/Software/docker/main.fish | 2 +- scripts/Arch/Software/firefox/main.fish | 2 +- scripts/Arch/Software/git/main.fish | 2 +- scripts/Arch/Software/grub/main.fish | 2 +- scripts/Arch/Software/icedtea/main.fish | 2 +- scripts/Arch/Software/logo-ls/main.fish | 2 +- scripts/Arch/Software/lutris/main.fish | 2 +- .../Arch/Software/minegrub-theme/main.fish | 2 +- scripts/Arch/Software/nix/main.fish | 2 +- scripts/Arch/Software/nodejs-n/main.fish | 2 +- scripts/Arch/Software/nvidia-dkms/main.fish | 2 +- scripts/Arch/Software/oh-my-posh/main.fish | 2 +- scripts/Arch/Software/openssh/main.fish | 2 +- scripts/Arch/Software/pacman/main.fish | 2 +- scripts/Arch/Software/pennywise/main.fish | 2 +- scripts/Arch/Software/plasma/main.fish | 2 +- scripts/Arch/Software/powershell/main.fish | 2 +- scripts/Arch/Software/pyenv/main.fish | 2 +- scripts/Arch/Software/rclone/main.fish | 2 +- scripts/Arch/Software/sddm/main.fish | 2 +- scripts/Arch/Software/steam/main.fish | 4 +-- scripts/Arch/Software/sudo/main.fish | 2 +- scripts/Arch/Software/vim/main.fish | 2 +- scripts/Arch/Software/virt-manager/main.fish | 2 +- scripts/Arch/Software/vscode/main.fish | 2 +- scripts/Arch/Software/waydroid/main.fish | 2 +- scripts/Arch/Software/xone/main.fish | 2 +- scripts/Arch/Software/yay/main.fish | 2 +- scripts/Arch/Software/zoxide/main.fish | 2 +- scripts/Arch/{Scripts => lib}/deploy.fish | 0 scripts/Arch/{Scripts => lib}/software.fish | 2 +- .../Common/Drivers/Logitech G903/main.fish | 2 +- scripts/Common/Drivers/SurfaceBook2/main.fish | 2 +- scripts/Common/OS/install.fish | 8 ++--- scripts/Common/OS/setup.fish | 6 ++-- scripts/Common/OS/users.fish | 2 +- scripts/Common/Software/aliae/Main.ps1 | 2 +- scripts/Common/Software/aliae/main.fish | 2 +- scripts/Common/Software/bash/main.fish | 2 +- scripts/Common/Software/bash/profile.fish | 2 +- scripts/Common/Software/brave/main.fish | 2 +- scripts/Common/Software/docker/main.fish | 2 +- scripts/Common/Software/firefox/main.fish | 2 +- scripts/Common/Software/fish/profile.fish | 2 +- scripts/Common/Software/git/Main.ps1 | 4 +-- scripts/Common/Software/git/main.fish | 2 +- scripts/Common/Software/grub/main.fish | 4 +-- scripts/Common/Software/logo-ls/main.fish | 2 +- .../Common/Software/minegrub-theme/main.fish | 2 +- scripts/Common/Software/nix/main.fish | 2 +- scripts/Common/Software/nodejs-n/main.fish | 2 +- scripts/Common/Software/nuke-usb/main.fish | 2 +- scripts/Common/Software/nvidia-dkms/main.fish | 2 +- scripts/Common/Software/oh-my-posh/Main.ps1 | 2 +- scripts/Common/Software/oh-my-posh/main.fish | 2 +- scripts/Common/Software/posh-git/Main.ps1 | 2 +- scripts/Common/Software/posh-git/main.fish | 2 +- scripts/Common/Software/powershell/Main.ps1 | 2 +- .../Common/Software/powershell/Profile.ps1 | 4 +-- scripts/Common/Software/powershell/main.fish | 2 +- scripts/Common/Software/pyenv/main.fish | 2 +- scripts/Common/Software/rclone/main.fish | 4 +-- .../Common/Software/terminal-icons/Main.ps1 | 2 +- .../Common/Software/terminal-icons/main.fish | 2 +- scripts/Common/Software/vim/main.fish | 2 +- .../Common/Software/virt-manager/main.fish | 2 +- scripts/Common/Software/vscode/Main.ps1 | 4 +-- scripts/Common/Software/vscode/main.fish | 2 +- scripts/Common/Software/zoxide/Main.ps1 | 2 +- scripts/Common/Software/zoxide/main.fish | 2 +- .../Windows/Drivers/AMDChipsetX399/Main.ps1 | 2 +- .../Windows/Drivers/Predator Z301C/Main.ps1 | 4 +-- .../AMDChipsetX399/Main.ps1 | 2 +- .../IntelBluetooth/Main.ps1 | 2 +- .../IntelWiFi/Main.ps1 | 2 +- .../MarvellEthernet/Main.ps1 | 2 +- scripts/Windows/Drivers/Tobii EyeX/Main.ps1 | 4 +-- scripts/Windows/OS/Manage.ps1 | 30 +++++++++---------- scripts/Windows/OS/Setup.ps1 | 6 ++-- scripts/Windows/Software/aliae/Main.ps1 | 4 +-- scripts/Windows/Software/chocolatey/Main.ps1 | 2 +- scripts/Windows/Software/discord/Main.ps1 | 6 ++-- scripts/Windows/Software/ext4fsd/Main.ps1 | 4 +-- scripts/Windows/Software/firefox/Main.ps1 | 6 ++-- scripts/Windows/Software/git/Main.ps1 | 6 ++-- scripts/Windows/Software/lghub/Main.ps1 | 6 ++-- scripts/Windows/Software/maniaplanet/Main.ps1 | 8 ++--- .../Windows/Software/msedge-redirect/Main.ps1 | 4 +-- scripts/Windows/Software/nextcloud/Main.ps1 | 4 +-- scripts/Windows/Software/nvs/Main.ps1 | 4 +-- scripts/Windows/Software/oh-my-posh/Main.ps1 | 4 +-- scripts/Windows/Software/openssh/Main.ps1 | 2 +- scripts/Windows/Software/osu!/Main.ps1 | 6 ++-- scripts/Windows/Software/osu!lazer/Main.ps1 | 8 ++--- scripts/Windows/Software/pinned-item/Main.ps1 | 2 +- scripts/Windows/Software/powershell/Main.ps1 | 2 +- scripts/Windows/Software/putty/Main.ps1 | 8 ++--- scripts/Windows/Software/retroarch/Main.ps1 | 8 ++--- scripts/Windows/Software/rewasd/Main.ps1 | 8 ++--- scripts/Windows/Software/thunderbird/Main.ps1 | 6 ++-- .../Software/tm-nations-forever/Main.ps1 | 4 +-- .../Software/tm-united-forever/Main.ps1 | 2 +- .../Software/tm-united-forever/Manage.ps1 | 4 +-- .../Windows/Software/tobii-gamehub/Main.ps1 | 6 ++-- scripts/Windows/Software/tobii-ghost/Main.ps1 | 6 ++-- .../ubiquiti-unifi-controller/Main.ps1 | 6 ++-- .../Windows/Software/visualstudio/Main.ps1 | 12 ++++---- scripts/Windows/Software/vscode/Main.ps1 | 4 +-- scripts/Windows/Software/windows/Main.ps1 | 10 +++---- scripts/Windows/Software/winget/Main.ps1 | 2 +- scripts/Windows/Software/winscp/Main.ps1 | 8 ++--- scripts/Windows/Software/zoxide/Main.ps1 | 4 +-- .../{Scripts => lib}/AppAssociations.ps1 | 0 .../Windows/{Scripts => lib}/Constants.ps1 | 0 .../Windows/{Scripts => lib}/Deployment.ps1 | 4 +-- .../{Scripts => lib}/PowerManagement.ps1 | 4 +-- scripts/Windows/{Scripts => lib}/Registry.ps1 | 0 .../Windows/{Scripts => lib}/Restoration.ps1 | 2 +- scripts/Windows/{Scripts => lib}/Security.ps1 | 0 .../{Scripts => lib}/SoftwareManagement.ps1 | 4 +-- scripts/Windows/{Scripts => lib}/System.ps1 | 0 scripts/Windows/{Scripts => lib}/Tasks.ps1 | 2 +- scripts/Windows/{Scripts => lib}/Update.ps1 | 0 scripts/Windows/{Scripts => lib}/Users.ps1 | 4 +-- scripts/Windows/{Scripts => lib}/WSL.ps1 | 4 +-- .../Scripts => lib}/BrowserAutomation.ps1 | 0 scripts/{Common/Scripts => lib}/Config.ps1 | 14 ++++----- .../{Common/Scripts => lib}/Operations.ps1 | 22 +++++++------- scripts/{Common/Scripts => lib}/Scripting.ps1 | 0 scripts/{Common/Scripts => lib}/Software.ps1 | 4 +-- .../Scripts => lib}/SoftwareManagement.ps1 | 0 scripts/{Common/Scripts => lib}/System.ps1 | 0 scripts/{ => lib}/config.fish | 0 scripts/{ => lib}/copy-repo.fish | 0 .../{Common/Scripts => lib}/eval-flake.fish | 4 +-- scripts/{Common/Scripts => lib}/hooks.fish | 0 .../{Common/Scripts => lib}/profile-base.fish | 0 scripts/{Common/Scripts => lib}/settings.fish | 2 +- scripts/{Common/Scripts => lib}/software.fish | 0 .../{Common/Scripts => lib}/wait-network.fish | 0 winiso/deploy.fish | 4 +-- 150 files changed, 248 insertions(+), 248 deletions(-) rename scripts/Arch/{Scripts => lib}/deploy.fish (100%) rename scripts/Arch/{Scripts => lib}/software.fish (92%) rename scripts/Windows/{Scripts => lib}/AppAssociations.ps1 (100%) rename scripts/Windows/{Scripts => lib}/Constants.ps1 (100%) rename scripts/Windows/{Scripts => lib}/Deployment.ps1 (98%) rename scripts/Windows/{Scripts => lib}/PowerManagement.ps1 (98%) rename scripts/Windows/{Scripts => lib}/Registry.ps1 (100%) rename scripts/Windows/{Scripts => lib}/Restoration.ps1 (98%) rename scripts/Windows/{Scripts => lib}/Security.ps1 (100%) rename scripts/Windows/{Scripts => lib}/SoftwareManagement.ps1 (98%) rename scripts/Windows/{Scripts => lib}/System.ps1 (100%) rename scripts/Windows/{Scripts => lib}/Tasks.ps1 (98%) rename scripts/Windows/{Scripts => lib}/Update.ps1 (100%) rename scripts/Windows/{Scripts => lib}/Users.ps1 (98%) rename scripts/Windows/{Scripts => lib}/WSL.ps1 (97%) rename scripts/{Common/Scripts => lib}/BrowserAutomation.ps1 (100%) rename scripts/{Common/Scripts => lib}/Config.ps1 (93%) rename scripts/{Common/Scripts => lib}/Operations.ps1 (94%) rename scripts/{Common/Scripts => lib}/Scripting.ps1 (100%) rename scripts/{Common/Scripts => lib}/Software.ps1 (98%) rename scripts/{Common/Scripts => lib}/SoftwareManagement.ps1 (100%) rename scripts/{Common/Scripts => lib}/System.ps1 (100%) rename scripts/{ => lib}/config.fish (100%) rename scripts/{ => lib}/copy-repo.fish (100%) rename scripts/{Common/Scripts => lib}/eval-flake.fish (86%) rename scripts/{Common/Scripts => lib}/hooks.fish (100%) rename scripts/{Common/Scripts => lib}/profile-base.fish (100%) rename scripts/{Common/Scripts => lib}/settings.fish (96%) rename scripts/{Common/Scripts => lib}/software.fish (100%) rename scripts/{Common/Scripts => lib}/wait-network.fish (100%) diff --git a/archiso/scripts/build.fish b/archiso/scripts/build.fish index 143d1a63..a21b0832 100755 --- a/archiso/scripts/build.fish +++ b/archiso/scripts/build.fish @@ -1,6 +1,6 @@ #!/bin/env fish begin - source "$(status dirname)/../../scripts/config.fish" + source "$(status dirname)/../../scripts/lib/config.fish" set -l projectName archiso-valhalla set -l overlayDir (mktemp -d) set -l upperDir (mktemp -d) @@ -14,7 +14,7 @@ begin set -l nixDir "$profileDir/$root/nix/var/nix/profiles/per-user/root/channels/nixpkgs" mkdir -p "$rootHome" - and fish "$(status dirname)/../../scripts/copy-repo.fish" "$projectDir" + and fish "$(status dirname)/../../scripts/lib/copy-repo.fish" "$projectDir" and begin if [ ! -d "$nixCache" ] diff --git a/scripts/Arch/Config/SecureBoot/main.fish b/scripts/Arch/Config/SecureBoot/main.fish index 9f675965..c4b76e45 100755 --- a/scripts/Arch/Config/SecureBoot/main.fish +++ b/scripts/Arch/Config/SecureBoot/main.fish @@ -1,14 +1,14 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../lib/software.fish" function installSW -V dir yayinst secureboot-grub end function configureSW -V dir - source "$dir/../../../Common/Scripts/settings.fish" + source "$dir/../../../lib/settings.fish" set -l label (getOSConfig boot.label) set -l efiDir (getOSConfig boot.efiMountPoint) set -l bootNums (efibootmgr | sed "/$label/{ s/^.*Boot\([[:digit:]]\+\)\*.*\$/\1/; p; }; d") diff --git a/scripts/Arch/Drivers/Surface/main.fish b/scripts/Arch/Drivers/Surface/main.fish index 86518934..bda43637 100755 --- a/scripts/Arch/Drivers/Surface/main.fish +++ b/scripts/Arch/Drivers/Surface/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../lib/software.fish" function installSW -V dir set -l repo linux-surface diff --git a/scripts/Arch/Drivers/SurfaceBook2/main.fish b/scripts/Arch/Drivers/SurfaceBook2/main.fish index 28fe415e..c873786a 100755 --- a/scripts/Arch/Drivers/SurfaceBook2/main.fish +++ b/scripts/Arch/Drivers/SurfaceBook2/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../lib/software.fish" function installSW -V dir yayinst \ diff --git a/scripts/Arch/OS/install.fish b/scripts/Arch/OS/install.fish index 1c7703b1..727970c1 100755 --- a/scripts/Arch/OS/install.fish +++ b/scripts/Arch/OS/install.fish @@ -3,21 +3,21 @@ begin set -l dir (status dirname) function installValhallaDeps -V dir - source "$dir/../Scripts/software.fish" + source "$dir/../lib/software.fish" and pacinst fish git jq nix sudo tmux end function getDeploymentScript -V dir - echo "$dir/../Scripts/deploy.fish" + echo "$dir/../lib/deploy.fish" end function initialize -V dir - source "$dir/../../Common/Scripts/wait-network.fish" + source "$dir/../../lib/wait-network.fish" waitNetwork or exit sudo systemctl enable --now nix-daemon - and source "$dir/../Scripts/software.fish" + and source "$dir/../lib/software.fish" and source "$dir/../Software/base-devel/main.fish" and source "$dir/../Software/pacman/main.fish" and source "$dir/../Software/yay/main.fish" diff --git a/scripts/Arch/OS/setup.fish b/scripts/Arch/OS/setup.fish index 761981f4..4332a697 100755 --- a/scripts/Arch/OS/setup.fish +++ b/scripts/Arch/OS/setup.fish @@ -2,7 +2,7 @@ begin set -l dir (status dirname) source "$dir/../../Common/OS/setup.fish" - source "$dir/../../Common/Scripts/settings.fish" + source "$dir/../../lib/settings.fish" function runChroot -S arch-chroot $argv @@ -23,8 +23,8 @@ begin end function setupOS -S -V dir -S - source "$dir/../../Common/Scripts/hooks.fish" - source "$dir/../../Common/Scripts/wait-network.fish" + source "$dir/../../lib/hooks.fish" + source "$dir/../../lib/wait-network.fish" waitNetwork and begin diff --git a/scripts/Arch/Software/aliae/main.fish b/scripts/Arch/Software/aliae/main.fish index 172049d3..a4b59185 100755 --- a/scripts/Arch/Software/aliae/main.fish +++ b/scripts/Arch/Software/aliae/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../lib/software.fish" inherit "$dir/../../../Common/Software/aliae/main.fish" function installSW diff --git a/scripts/Arch/Software/base-devel/main.fish b/scripts/Arch/Software/base-devel/main.fish index 9728e053..c4c861bd 100755 --- a/scripts/Arch/Software/base-devel/main.fish +++ b/scripts/Arch/Software/base-devel/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../lib/software.fish" function installSW pacinst base-devel diff --git a/scripts/Arch/Software/brave/main.fish b/scripts/Arch/Software/brave/main.fish index ddcb60d7..78f3e732 100755 --- a/scripts/Arch/Software/brave/main.fish +++ b/scripts/Arch/Software/brave/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../lib/software.fish" inherit "$dir/../../../Common/Software/brave/main.fish" function installSW diff --git a/scripts/Arch/Software/docker/main.fish b/scripts/Arch/Software/docker/main.fish index ca1197eb..4cdaee8a 100755 --- a/scripts/Arch/Software/docker/main.fish +++ b/scripts/Arch/Software/docker/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../lib/software.fish" inherit "$dir/../../../Common/Software/docker/main.fish" function installSW diff --git a/scripts/Arch/Software/firefox/main.fish b/scripts/Arch/Software/firefox/main.fish index 41fa50a7..b7841298 100755 --- a/scripts/Arch/Software/firefox/main.fish +++ b/scripts/Arch/Software/firefox/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../lib/software.fish" inherit "$dir/../../../Common/Software/firefox/main.fish" function installSW -V dir diff --git a/scripts/Arch/Software/git/main.fish b/scripts/Arch/Software/git/main.fish index 31f2feec..e990a0e3 100755 --- a/scripts/Arch/Software/git/main.fish +++ b/scripts/Arch/Software/git/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../lib/software.fish" inherit "$dir/../../../Common/Software/git/main.fish" function installSW diff --git a/scripts/Arch/Software/grub/main.fish b/scripts/Arch/Software/grub/main.fish index 8a416380..4f7ed00a 100755 --- a/scripts/Arch/Software/grub/main.fish +++ b/scripts/Arch/Software/grub/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../lib/software.fish" inherit "$dir/../../../Common/Software/grub/main.fish" function installSW -V dir diff --git a/scripts/Arch/Software/icedtea/main.fish b/scripts/Arch/Software/icedtea/main.fish index 0159b820..cf560da7 100755 --- a/scripts/Arch/Software/icedtea/main.fish +++ b/scripts/Arch/Software/icedtea/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../lib/software.fish" function installSW yayinst \ diff --git a/scripts/Arch/Software/logo-ls/main.fish b/scripts/Arch/Software/logo-ls/main.fish index dfeefa5c..d3a5583f 100755 --- a/scripts/Arch/Software/logo-ls/main.fish +++ b/scripts/Arch/Software/logo-ls/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../lib/software.fish" inherit "$dir/../../../Common/Software/logo-ls/main.fish" function installSW -V dir diff --git a/scripts/Arch/Software/lutris/main.fish b/scripts/Arch/Software/lutris/main.fish index 40f925ea..3fb880cb 100755 --- a/scripts/Arch/Software/lutris/main.fish +++ b/scripts/Arch/Software/lutris/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../lib/software.fish" function installSW yayinst \ diff --git a/scripts/Arch/Software/minegrub-theme/main.fish b/scripts/Arch/Software/minegrub-theme/main.fish index 9f924681..3961f5f7 100755 --- a/scripts/Arch/Software/minegrub-theme/main.fish +++ b/scripts/Arch/Software/minegrub-theme/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../lib/software.fish" inherit "$dir/../../../Common/Software/minegrub-theme/main.fish" function installSW diff --git a/scripts/Arch/Software/nix/main.fish b/scripts/Arch/Software/nix/main.fish index f20c6783..0217324d 100755 --- a/scripts/Arch/Software/nix/main.fish +++ b/scripts/Arch/Software/nix/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../lib/software.fish" inherit "$dir/../../../Common/Software/nix/main.fish" function installSW diff --git a/scripts/Arch/Software/nodejs-n/main.fish b/scripts/Arch/Software/nodejs-n/main.fish index b319581f..bf2db838 100755 --- a/scripts/Arch/Software/nodejs-n/main.fish +++ b/scripts/Arch/Software/nodejs-n/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../lib/software.fish" function installSW yayinst nodejs-n diff --git a/scripts/Arch/Software/nvidia-dkms/main.fish b/scripts/Arch/Software/nvidia-dkms/main.fish index 65d37e00..c29486f4 100755 --- a/scripts/Arch/Software/nvidia-dkms/main.fish +++ b/scripts/Arch/Software/nvidia-dkms/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../lib/software.fish" inherit "$dir/../../../Common/Software/nvidia-dkms/main.fish" function installSW diff --git a/scripts/Arch/Software/oh-my-posh/main.fish b/scripts/Arch/Software/oh-my-posh/main.fish index c73b8015..b7cd7bf4 100755 --- a/scripts/Arch/Software/oh-my-posh/main.fish +++ b/scripts/Arch/Software/oh-my-posh/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../lib/software.fish" inherit "$dir/../../../Common/Software/oh-my-posh/main.fish" function installSW diff --git a/scripts/Arch/Software/openssh/main.fish b/scripts/Arch/Software/openssh/main.fish index 663b7c4b..6c58ca98 100755 --- a/scripts/Arch/Software/openssh/main.fish +++ b/scripts/Arch/Software/openssh/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../lib/software.fish" function installSW yayinst \ diff --git a/scripts/Arch/Software/pacman/main.fish b/scripts/Arch/Software/pacman/main.fish index 9fead58b..f016684d 100755 --- a/scripts/Arch/Software/pacman/main.fish +++ b/scripts/Arch/Software/pacman/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../lib/software.fish" function installSW configureSW diff --git a/scripts/Arch/Software/pennywise/main.fish b/scripts/Arch/Software/pennywise/main.fish index 6fc017b3..a6f824cc 100755 --- a/scripts/Arch/Software/pennywise/main.fish +++ b/scripts/Arch/Software/pennywise/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../lib/software.fish" function installSW yayinst \ diff --git a/scripts/Arch/Software/plasma/main.fish b/scripts/Arch/Software/plasma/main.fish index 2f3da66a..130fb005 100755 --- a/scripts/Arch/Software/plasma/main.fish +++ b/scripts/Arch/Software/plasma/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../lib/software.fish" function installSW yayinst \ diff --git a/scripts/Arch/Software/powershell/main.fish b/scripts/Arch/Software/powershell/main.fish index 3f77781e..1ad5c1d0 100755 --- a/scripts/Arch/Software/powershell/main.fish +++ b/scripts/Arch/Software/powershell/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../lib/software.fish" inherit "$dir/../../../Common/Software/powershell/main.fish" function installSW diff --git a/scripts/Arch/Software/pyenv/main.fish b/scripts/Arch/Software/pyenv/main.fish index 99bcaffe..f7d8a8d2 100755 --- a/scripts/Arch/Software/pyenv/main.fish +++ b/scripts/Arch/Software/pyenv/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../lib/software.fish" inherit "$dir/../../../Common/Software/pyenv/main.fish" function installSW diff --git a/scripts/Arch/Software/rclone/main.fish b/scripts/Arch/Software/rclone/main.fish index 4650961b..850b5b2c 100755 --- a/scripts/Arch/Software/rclone/main.fish +++ b/scripts/Arch/Software/rclone/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../lib/software.fish" inherit "$dir/../../../Common/Software/rclone/main.fish" function installSW diff --git a/scripts/Arch/Software/sddm/main.fish b/scripts/Arch/Software/sddm/main.fish index 525953e6..fcc10f37 100755 --- a/scripts/Arch/Software/sddm/main.fish +++ b/scripts/Arch/Software/sddm/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../lib/software.fish" function installSW # `git` version diff --git a/scripts/Arch/Software/steam/main.fish b/scripts/Arch/Software/steam/main.fish index 73b0696f..08a34c8f 100644 --- a/scripts/Arch/Software/steam/main.fish +++ b/scripts/Arch/Software/steam/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../lib/software.fish" function installSW yayinst steam @@ -9,7 +9,7 @@ begin function configureSW -V dir - . "$dir/../../../Common/Scripts/settings.fish" + . "$dir/../../../lib/settings.fish" if isOSEnabled hidpi begin diff --git a/scripts/Arch/Software/sudo/main.fish b/scripts/Arch/Software/sudo/main.fish index 448fa45c..5e1d4af1 100755 --- a/scripts/Arch/Software/sudo/main.fish +++ b/scripts/Arch/Software/sudo/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../lib/software.fish" function installSW pacinst sudo diff --git a/scripts/Arch/Software/vim/main.fish b/scripts/Arch/Software/vim/main.fish index 53c4435e..9f4bdcbb 100755 --- a/scripts/Arch/Software/vim/main.fish +++ b/scripts/Arch/Software/vim/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../lib/software.fish" inherit "$dir/../../../Common/Software/vim/main.fish" function installSW diff --git a/scripts/Arch/Software/virt-manager/main.fish b/scripts/Arch/Software/virt-manager/main.fish index 8833d411..61e927f4 100755 --- a/scripts/Arch/Software/virt-manager/main.fish +++ b/scripts/Arch/Software/virt-manager/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../lib/software.fish" inherit "$dir/../../../Common/Software/virt-manager/main.fish" function installSW diff --git a/scripts/Arch/Software/vscode/main.fish b/scripts/Arch/Software/vscode/main.fish index 79655a1c..e075f409 100755 --- a/scripts/Arch/Software/vscode/main.fish +++ b/scripts/Arch/Software/vscode/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../lib/software.fish" function setFlags -a user set -l flags diff --git a/scripts/Arch/Software/waydroid/main.fish b/scripts/Arch/Software/waydroid/main.fish index 39d859ab..c2467060 100755 --- a/scripts/Arch/Software/waydroid/main.fish +++ b/scripts/Arch/Software/waydroid/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../lib/software.fish" function installSW yayinst ( diff --git a/scripts/Arch/Software/xone/main.fish b/scripts/Arch/Software/xone/main.fish index b3636541..30e04a2a 100755 --- a/scripts/Arch/Software/xone/main.fish +++ b/scripts/Arch/Software/xone/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../lib/software.fish" function installSW set -l contextRoot (mktemp -d) diff --git a/scripts/Arch/Software/yay/main.fish b/scripts/Arch/Software/yay/main.fish index 5c693b4d..b6282549 100755 --- a/scripts/Arch/Software/yay/main.fish +++ b/scripts/Arch/Software/yay/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../lib/software.fish" function installSW if not type -q yay diff --git a/scripts/Arch/Software/zoxide/main.fish b/scripts/Arch/Software/zoxide/main.fish index 47ad6d9d..6e373e00 100755 --- a/scripts/Arch/Software/zoxide/main.fish +++ b/scripts/Arch/Software/zoxide/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../lib/software.fish" inherit "$dir/../../../Common/Software/zoxide/main.fish" function installSW diff --git a/scripts/Arch/Scripts/deploy.fish b/scripts/Arch/lib/deploy.fish similarity index 100% rename from scripts/Arch/Scripts/deploy.fish rename to scripts/Arch/lib/deploy.fish diff --git a/scripts/Arch/Scripts/software.fish b/scripts/Arch/lib/software.fish similarity index 92% rename from scripts/Arch/Scripts/software.fish rename to scripts/Arch/lib/software.fish index 0f3f85ef..67576c7c 100755 --- a/scripts/Arch/Scripts/software.fish +++ b/scripts/Arch/lib/software.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Common/Scripts/software.fish" + source "$dir/../../lib/software.fish" function runYay -d "Run yay with pre-configured defaults" if not isatty 0 diff --git a/scripts/Common/Drivers/Logitech G903/main.fish b/scripts/Common/Drivers/Logitech G903/main.fish index 5f874847..364504af 100644 --- a/scripts/Common/Drivers/Logitech G903/main.fish +++ b/scripts/Common/Drivers/Logitech G903/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../../lib/software.fish" function configureSW -V dir . "$dir/../../Software/plasma/input.fish" diff --git a/scripts/Common/Drivers/SurfaceBook2/main.fish b/scripts/Common/Drivers/SurfaceBook2/main.fish index 8d2757a7..909a90cc 100644 --- a/scripts/Common/Drivers/SurfaceBook2/main.fish +++ b/scripts/Common/Drivers/SurfaceBook2/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../../lib/software.fish" function configureSW -V dir . "$dir/../../Software/plasma/input.fish" diff --git a/scripts/Common/OS/install.fish b/scripts/Common/OS/install.fish index 935530a5..4429fe18 100755 --- a/scripts/Common/OS/install.fish +++ b/scripts/Common/OS/install.fish @@ -1,11 +1,11 @@ #!/bin/env fish set -l dir (status dirname) set -l cmdline (cat /proc/$fish_pid/cmdline | string split0) -source "$dir/../Scripts/settings.fish" -source "$dir/../Scripts/hooks.fish" +source "$dir/../../lib/settings.fish" +source "$dir/../../lib/hooks.fish" if [ (id -u) -eq 0 ] - source "$dir/../../config.fish" + source "$dir/../../lib/config.fish" set -l sudoConfig "/etc/sudoers.d/PortValhalla" set -l channelDir /nix/var/nix/profiles/per-user/root/channels/nixpkgs rm ~/.bash_profile @@ -79,7 +79,7 @@ else runHook initializeUsers || begin if [ -n "$deployScript" ] - source "$dir/../Scripts/settings.fish" + source "$dir/../../lib/settings.fish" for name in (getUsers | jq '.[]' --raw-output0 | string split0) echo "Configuring user `$name`..." diff --git a/scripts/Common/OS/setup.fish b/scripts/Common/OS/setup.fish index c3cde26f..040c672f 100755 --- a/scripts/Common/OS/setup.fish +++ b/scripts/Common/OS/setup.fish @@ -1,8 +1,8 @@ #!/bin/env fish function runSetup set -l dir (status dirname) - source "$dir/../Scripts/settings.fish" - source "$dir/../Scripts/hooks.fish" + source "$dir/../../lib/settings.fish" + source "$dir/../../lib/hooks.fish" if [ -z "$CONFIG_NAME" ] selectProfile config @@ -60,7 +60,7 @@ function runSetup and runHook --force installValhallaDeps 'Please set up a function `installValhallaDeps` for installing `fish`, `git`, `jq`, `nix`, `sudo` and `tmux`.' and echo "Cloning project..." - and source "$dir/../../copy-repo.fish" "$mountDir$PROJECT_CLONE_ROOT" + and source "$dir/../../lib/copy-repo.fish" "$mountDir$PROJECT_CLONE_ROOT" runChroot "$mountDir" git config --system --add safe.directory "$PROJECT_CLONE_ROOT" and runHook setupOS diff --git a/scripts/Common/OS/users.fish b/scripts/Common/OS/users.fish index 60981071..662d3f51 100755 --- a/scripts/Common/OS/users.fish +++ b/scripts/Common/OS/users.fish @@ -1,6 +1,6 @@ #!/bin/env fish set -l dir (status dirname) -source "$dir/../Scripts/settings.fish" +source "$dir/../../lib/settings.fish" set -l users (getUsers) echo "Creating users..." diff --git a/scripts/Common/Software/aliae/Main.ps1 b/scripts/Common/Software/aliae/Main.ps1 index 56cae6a7..65279046 100644 --- a/scripts/Common/Software/aliae/Main.ps1 +++ b/scripts/Common/Software/aliae/Main.ps1 @@ -1,6 +1,6 @@ . "$PSScriptRoot/Constants.ps1"; . "$PSScriptRoot/../powershell/Profile.ps1"; -. "$PSScriptRoot/../../Scripts/Software.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; Start-SoftwareInstaller @args ` -Configurator { diff --git a/scripts/Common/Software/aliae/main.fish b/scripts/Common/Software/aliae/main.fish index aae37cb6..35957f97 100755 --- a/scripts/Common/Software/aliae/main.fish +++ b/scripts/Common/Software/aliae/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../../lib/software.fish" function configureSW -V dir source "$dir/../bash/profile.fish" diff --git a/scripts/Common/Software/bash/main.fish b/scripts/Common/Software/bash/main.fish index aacc85fb..be9be0f4 100755 --- a/scripts/Common/Software/bash/main.fish +++ b/scripts/Common/Software/bash/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../../lib/software.fish" function configureSW -V dir begin diff --git a/scripts/Common/Software/bash/profile.fish b/scripts/Common/Software/bash/profile.fish index c13ed857..4c93610c 100755 --- a/scripts/Common/Software/bash/profile.fish +++ b/scripts/Common/Software/bash/profile.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/profile-base.fish" + source "$dir/../../../lib/profile-base.fish" function getBashStatements end diff --git a/scripts/Common/Software/brave/main.fish b/scripts/Common/Software/brave/main.fish index b121d9a2..6a556154 100755 --- a/scripts/Common/Software/brave/main.fish +++ b/scripts/Common/Software/brave/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../../lib/software.fish" function configureSW -V dir set -l bin diff --git a/scripts/Common/Software/docker/main.fish b/scripts/Common/Software/docker/main.fish index 4afb1212..9523507b 100755 --- a/scripts/Common/Software/docker/main.fish +++ b/scripts/Common/Software/docker/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../../lib/software.fish" function configureSW -V dir sudo systemctl enable --now docker diff --git a/scripts/Common/Software/firefox/main.fish b/scripts/Common/Software/firefox/main.fish index 17ff3ef5..77a9d64c 100755 --- a/scripts/Common/Software/firefox/main.fish +++ b/scripts/Common/Software/firefox/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../../lib/software.fish" function configureSW -V dir sudo cp "$dir/firefox.sh" /etc/profile.d/ diff --git a/scripts/Common/Software/fish/profile.fish b/scripts/Common/Software/fish/profile.fish index d124b3d2..1d961426 100755 --- a/scripts/Common/Software/fish/profile.fish +++ b/scripts/Common/Software/fish/profile.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/profile-base.fish" + source "$dir/../../../lib/profile-base.fish" function installFishProfile -a name title addProfileStatement "$name" "$title" "/bin/env fish" fish /etc/fish/conf.d $argv[3..] diff --git a/scripts/Common/Software/git/Main.ps1 b/scripts/Common/Software/git/Main.ps1 index 048913f5..2c7e4d68 100644 --- a/scripts/Common/Software/git/Main.ps1 +++ b/scripts/Common/Software/git/Main.ps1 @@ -1,5 +1,5 @@ -. "$PSScriptRoot/../../Scripts/Software.ps1"; -. "$PSScriptRoot/../../Scripts/System.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; +. "$PSScriptRoot/../../../lib/System.ps1"; . "$PSScriptRoot/../../Types/InstallerAction.ps1"; & { diff --git a/scripts/Common/Software/git/main.fish b/scripts/Common/Software/git/main.fish index 824daa58..fe0e473a 100755 --- a/scripts/Common/Software/git/main.fish +++ b/scripts/Common/Software/git/main.fish @@ -2,7 +2,7 @@ begin set -l dir (status dirname) set -l base "$dir/Main.ps1" - source "$(status dirname)/../../Scripts/software.fish" + source "$(status dirname)/../../../lib/software.fish" function configureSW -S -V base pwsh "$base" Configure diff --git a/scripts/Common/Software/grub/main.fish b/scripts/Common/Software/grub/main.fish index 2d08717b..7c479a43 100755 --- a/scripts/Common/Software/grub/main.fish +++ b/scripts/Common/Software/grub/main.fish @@ -1,8 +1,8 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/settings.fish" - source "$dir/../../Scripts/software.fish" + source "$dir/../../../lib/settings.fish" + source "$dir/../../../lib/software.fish" function configureSW set -l efiDir (getOSConfig boot.efiMountPoint) diff --git a/scripts/Common/Software/logo-ls/main.fish b/scripts/Common/Software/logo-ls/main.fish index 1b6776fa..06e6c4a6 100755 --- a/scripts/Common/Software/logo-ls/main.fish +++ b/scripts/Common/Software/logo-ls/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../../lib/software.fish" function configureSW -V dir source "$dir/../bash/profile.fish" diff --git a/scripts/Common/Software/minegrub-theme/main.fish b/scripts/Common/Software/minegrub-theme/main.fish index 026dbd23..d699e0eb 100755 --- a/scripts/Common/Software/minegrub-theme/main.fish +++ b/scripts/Common/Software/minegrub-theme/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../../lib/software.fish" function configureSW -V dir sudo sed -i \ diff --git a/scripts/Common/Software/nix/main.fish b/scripts/Common/Software/nix/main.fish index bba7c6f7..00a76ee2 100755 --- a/scripts/Common/Software/nix/main.fish +++ b/scripts/Common/Software/nix/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../../lib/software.fish" function configureSW -V dir -a scope sudo nix-channel --add https://nixos.org/channels/nixpkgs-unstable diff --git a/scripts/Common/Software/nodejs-n/main.fish b/scripts/Common/Software/nodejs-n/main.fish index 79ba523e..4bb7acfd 100755 --- a/scripts/Common/Software/nodejs-n/main.fish +++ b/scripts/Common/Software/nodejs-n/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../../lib/software.fish" function installSW npm install --global n diff --git a/scripts/Common/Software/nuke-usb/main.fish b/scripts/Common/Software/nuke-usb/main.fish index 0902bb56..11a7ec19 100755 --- a/scripts/Common/Software/nuke-usb/main.fish +++ b/scripts/Common/Software/nuke-usb/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../../lib/software.fish" function installSW -V dir sudo install -m 755 "$dir/nuke-usb.sh" /usr/local/bin/nuke-usb diff --git a/scripts/Common/Software/nvidia-dkms/main.fish b/scripts/Common/Software/nvidia-dkms/main.fish index ba45c051..482e66b8 100755 --- a/scripts/Common/Software/nvidia-dkms/main.fish +++ b/scripts/Common/Software/nvidia-dkms/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../../lib/software.fish" function configureSW -V dir # According to: https://wiki.archlinux.org/title/NVIDIA/Tips_and_tricks diff --git a/scripts/Common/Software/oh-my-posh/Main.ps1 b/scripts/Common/Software/oh-my-posh/Main.ps1 index 397be6a1..2a537820 100644 --- a/scripts/Common/Software/oh-my-posh/Main.ps1 +++ b/scripts/Common/Software/oh-my-posh/Main.ps1 @@ -1,6 +1,6 @@ . "$PSScriptRoot/../aliae/Manage.ps1"; . "$PSScriptRoot/../powershell/Profile.ps1"; -. "$PSScriptRoot/../../Scripts/Software.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; . "$PSScriptRoot/../../Types/InstallerAction.ps1"; Start-SoftwareInstaller @args ` diff --git a/scripts/Common/Software/oh-my-posh/main.fish b/scripts/Common/Software/oh-my-posh/main.fish index 6d27a7d1..0f23fa81 100644 --- a/scripts/Common/Software/oh-my-posh/main.fish +++ b/scripts/Common/Software/oh-my-posh/main.fish @@ -2,7 +2,7 @@ begin set -l dir (status dirname) set -l base "$dir/Main.ps1" - source "$dir/../../Scripts/software.fish" + source "$dir/../../../lib/software.fish" function configureSW -V dir -V base source "$dir/../bash/profile.fish" diff --git a/scripts/Common/Software/posh-git/Main.ps1 b/scripts/Common/Software/posh-git/Main.ps1 index 7ca4fa7f..af4ad013 100644 --- a/scripts/Common/Software/posh-git/Main.ps1 +++ b/scripts/Common/Software/posh-git/Main.ps1 @@ -1,5 +1,5 @@ . "$PSScriptRoot/../powershell/Module.ps1"; -. "$PSScriptRoot/../../Scripts/Software.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; $parameters = Get-ModuleInstallerComponents "posh-git"; Start-SoftwareInstaller @args @parameters; diff --git a/scripts/Common/Software/posh-git/main.fish b/scripts/Common/Software/posh-git/main.fish index bd149537..e7b1d225 100755 --- a/scripts/Common/Software/posh-git/main.fish +++ b/scripts/Common/Software/posh-git/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../../lib/software.fish" function installSW -V dir sudo -HE pwsh "$dir/Main.ps1" diff --git a/scripts/Common/Software/powershell/Main.ps1 b/scripts/Common/Software/powershell/Main.ps1 index c9ca7e63..594bc325 100644 --- a/scripts/Common/Software/powershell/Main.ps1 +++ b/scripts/Common/Software/powershell/Main.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot/../../Scripts/Software.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; . "$PSScriptRoot/../../Software/powershell/Profile.ps1"; . "$PSScriptRoot/../../Types/InstallerAction.ps1"; diff --git a/scripts/Common/Software/powershell/Profile.ps1 b/scripts/Common/Software/powershell/Profile.ps1 index 5ef75b7e..65794ffd 100644 --- a/scripts/Common/Software/powershell/Profile.ps1 +++ b/scripts/Common/Software/powershell/Profile.ps1 @@ -1,6 +1,6 @@ $null = New-Module { - . "$PSScriptRoot/../../Scripts/Scripting.ps1"; - . "$PSScriptRoot/../../Scripts/Software.ps1"; + . "$PSScriptRoot/../../../lib/Scripting.ps1"; + . "$PSScriptRoot/../../../lib/Software.ps1"; <# .SYNOPSIS diff --git a/scripts/Common/Software/powershell/main.fish b/scripts/Common/Software/powershell/main.fish index 15c19de0..fd65271a 100755 --- a/scripts/Common/Software/powershell/main.fish +++ b/scripts/Common/Software/powershell/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../../lib/software.fish" function configureSW -V dir sudo -HE pwsh "$dir/Main.ps1" Configure diff --git a/scripts/Common/Software/pyenv/main.fish b/scripts/Common/Software/pyenv/main.fish index 39725d95..79e8fcee 100755 --- a/scripts/Common/Software/pyenv/main.fish +++ b/scripts/Common/Software/pyenv/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../../lib/software.fish" function installSW curl https://pyenv.run | bash diff --git a/scripts/Common/Software/rclone/main.fish b/scripts/Common/Software/rclone/main.fish index 067d4b25..68cee72f 100755 --- a/scripts/Common/Software/rclone/main.fish +++ b/scripts/Common/Software/rclone/main.fish @@ -1,14 +1,14 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../../lib/software.fish" function configureSW -V dir sudo cp "$dir/rclone.service" "$dir/rclone.target" "$dir/rclone@.service" /etc/systemd/user end function userConfig -V dir -a name - source "$dir/../../Scripts/settings.fish" + source "$dir/../../../lib/settings.fish" set -l key "programs.rclone.configurations" set -l configs (getUserConfig "$name" "$key" --apply "builtins.attrNames" --json) diff --git a/scripts/Common/Software/terminal-icons/Main.ps1 b/scripts/Common/Software/terminal-icons/Main.ps1 index d2f2142f..e20c4793 100644 --- a/scripts/Common/Software/terminal-icons/Main.ps1 +++ b/scripts/Common/Software/terminal-icons/Main.ps1 @@ -1,5 +1,5 @@ . "$PSScriptRoot/../powershell/Module.ps1"; -. "$PSScriptRoot/../../Scripts/Software.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; $parameters = Get-ModuleInstallerComponents "Terminal-Icons"; Start-SoftwareInstaller @args @parameters; diff --git a/scripts/Common/Software/terminal-icons/main.fish b/scripts/Common/Software/terminal-icons/main.fish index bd149537..e7b1d225 100755 --- a/scripts/Common/Software/terminal-icons/main.fish +++ b/scripts/Common/Software/terminal-icons/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../../lib/software.fish" function installSW -V dir sudo -HE pwsh "$dir/Main.ps1" diff --git a/scripts/Common/Software/vim/main.fish b/scripts/Common/Software/vim/main.fish index 87da27a2..e82df0b9 100755 --- a/scripts/Common/Software/vim/main.fish +++ b/scripts/Common/Software/vim/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../../lib/software.fish" function configureSW set -l configFile /etc/vimrc diff --git a/scripts/Common/Software/virt-manager/main.fish b/scripts/Common/Software/virt-manager/main.fish index a7984ca1..1fdadfc4 100755 --- a/scripts/Common/Software/virt-manager/main.fish +++ b/scripts/Common/Software/virt-manager/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../../lib/software.fish" function configureSW begin diff --git a/scripts/Common/Software/vscode/Main.ps1 b/scripts/Common/Software/vscode/Main.ps1 index e60b2828..c025fbd0 100644 --- a/scripts/Common/Software/vscode/Main.ps1 +++ b/scripts/Common/Software/vscode/Main.ps1 @@ -1,5 +1,5 @@ -. "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; -. "$PSScriptRoot/../../../Common/Scripts/SoftwareManagement.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; +. "$PSScriptRoot/../../../lib/SoftwareManagement.ps1"; Start-SoftwareInstaller @args ` -UserConfigurator { diff --git a/scripts/Common/Software/vscode/main.fish b/scripts/Common/Software/vscode/main.fish index e0629345..6d9a1059 100755 --- a/scripts/Common/Software/vscode/main.fish +++ b/scripts/Common/Software/vscode/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../../lib/software.fish" function userConfig -V dir runPSUserConfig "$dir/Main.ps1" $argv diff --git a/scripts/Common/Software/zoxide/Main.ps1 b/scripts/Common/Software/zoxide/Main.ps1 index aabaf8f8..27303ffb 100644 --- a/scripts/Common/Software/zoxide/Main.ps1 +++ b/scripts/Common/Software/zoxide/Main.ps1 @@ -1,5 +1,5 @@ . "$PSScriptRoot/../powershell/Profile.ps1"; -. "$PSScriptRoot/../../Scripts/Software.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; Start-SoftwareInstaller @args ` -Configurator { diff --git a/scripts/Common/Software/zoxide/main.fish b/scripts/Common/Software/zoxide/main.fish index 81722760..23a21edc 100755 --- a/scripts/Common/Software/zoxide/main.fish +++ b/scripts/Common/Software/zoxide/main.fish @@ -1,7 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) - source "$dir/../../Scripts/software.fish" + source "$dir/../../../lib/software.fish" function configureSW -V dir source "$dir/../bash/profile.fish" diff --git a/scripts/Windows/Drivers/AMDChipsetX399/Main.ps1 b/scripts/Windows/Drivers/AMDChipsetX399/Main.ps1 index aaed46be..1d5f21f6 100644 --- a/scripts/Windows/Drivers/AMDChipsetX399/Main.ps1 +++ b/scripts/Windows/Drivers/AMDChipsetX399/Main.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; Start-SoftwareInstaller -Force @args ` -Installer { diff --git a/scripts/Windows/Drivers/Predator Z301C/Main.ps1 b/scripts/Windows/Drivers/Predator Z301C/Main.ps1 index 22c28c04..bfbfa59d 100644 --- a/scripts/Windows/Drivers/Predator Z301C/Main.ps1 +++ b/scripts/Windows/Drivers/Predator Z301C/Main.ps1 @@ -1,5 +1,5 @@ -. "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; -. "$PSScriptRoot/../../../Common/Scripts/System.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; +. "$PSScriptRoot/../../../lib/System.ps1"; Start-SoftwareInstaller -Force @args ` -Installer { diff --git a/scripts/Windows/Drivers/ROG Zenith Extreme Alpha/AMDChipsetX399/Main.ps1 b/scripts/Windows/Drivers/ROG Zenith Extreme Alpha/AMDChipsetX399/Main.ps1 index 74fafb46..72b014b8 100644 --- a/scripts/Windows/Drivers/ROG Zenith Extreme Alpha/AMDChipsetX399/Main.ps1 +++ b/scripts/Windows/Drivers/ROG Zenith Extreme Alpha/AMDChipsetX399/Main.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot/../../../../Common/Scripts/Software.ps1"; +. "$PSScriptRoot/../../../../lib/Software.ps1"; Start-SoftwareInstaller -Force @args ` -Installer { diff --git a/scripts/Windows/Drivers/ROG Zenith Extreme Alpha/IntelBluetooth/Main.ps1 b/scripts/Windows/Drivers/ROG Zenith Extreme Alpha/IntelBluetooth/Main.ps1 index 2cf9e651..5a8bae55 100644 --- a/scripts/Windows/Drivers/ROG Zenith Extreme Alpha/IntelBluetooth/Main.ps1 +++ b/scripts/Windows/Drivers/ROG Zenith Extreme Alpha/IntelBluetooth/Main.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot/../../../../Common/Scripts/Software.ps1"; +. "$PSScriptRoot/../../../../lib/Software.ps1"; Start-SoftwareInstaller -Force @args ` -Installer { diff --git a/scripts/Windows/Drivers/ROG Zenith Extreme Alpha/IntelWiFi/Main.ps1 b/scripts/Windows/Drivers/ROG Zenith Extreme Alpha/IntelWiFi/Main.ps1 index 8656cf9a..db42ad57 100644 --- a/scripts/Windows/Drivers/ROG Zenith Extreme Alpha/IntelWiFi/Main.ps1 +++ b/scripts/Windows/Drivers/ROG Zenith Extreme Alpha/IntelWiFi/Main.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot/../../../../Common/Scripts/Software.ps1"; +. "$PSScriptRoot/../../../../lib/Software.ps1"; Start-SoftwareInstaller -Force @args ` -Installer { diff --git a/scripts/Windows/Drivers/ROG Zenith Extreme Alpha/MarvellEthernet/Main.ps1 b/scripts/Windows/Drivers/ROG Zenith Extreme Alpha/MarvellEthernet/Main.ps1 index 88dec5d6..fa0796a1 100644 --- a/scripts/Windows/Drivers/ROG Zenith Extreme Alpha/MarvellEthernet/Main.ps1 +++ b/scripts/Windows/Drivers/ROG Zenith Extreme Alpha/MarvellEthernet/Main.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot/../../../../Common/Scripts/Software.ps1"; +. "$PSScriptRoot/../../../../lib/Software.ps1"; Start-SoftwareInstaller -Force @args ` -Installer { diff --git a/scripts/Windows/Drivers/Tobii EyeX/Main.ps1 b/scripts/Windows/Drivers/Tobii EyeX/Main.ps1 index 59c88803..4c9f9ddc 100644 --- a/scripts/Windows/Drivers/Tobii EyeX/Main.ps1 +++ b/scripts/Windows/Drivers/Tobii EyeX/Main.ps1 @@ -1,6 +1,6 @@ & { - . "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1"; - . "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; + . "$PSScriptRoot/../../lib/SoftwareManagement.ps1"; + . "$PSScriptRoot/../../../lib/Software.ps1"; $softwarePath = "$PSScriptRoot/../../Software"; $appScripts = @( diff --git a/scripts/Windows/OS/Manage.ps1 b/scripts/Windows/OS/Manage.ps1 index 333685cd..31499884 100644 --- a/scripts/Windows/OS/Manage.ps1 +++ b/scripts/Windows/OS/Manage.ps1 @@ -1,24 +1,24 @@ #!/bin/pwsh using namespace System.Security.Principal; -. "$PSScriptRoot/../Scripts/Security.ps1"; -. "$PSScriptRoot/../Scripts/WSL.ps1"; +. "$PSScriptRoot/../lib/Security.ps1"; +. "$PSScriptRoot/../lib/WSL.ps1"; $null = New-Module { - . "$PSScriptRoot/../Scripts/Constants.ps1"; - . "$PSScriptRoot/../Scripts/Deployment.ps1"; - . "$PSScriptRoot/../Scripts/PowerManagement.ps1"; - . "$PSScriptRoot/../Scripts/Registry.ps1"; - . "$PSScriptRoot/../Scripts/Security.ps1"; - . "$PSScriptRoot/../Scripts/SoftwareManagement.ps1"; - . "$PSScriptRoot/../Scripts/System.ps1"; - . "$PSScriptRoot/../Scripts/Update.ps1"; - . "$PSScriptRoot/../Scripts/Users.ps1"; + . "$PSScriptRoot/../lib/Constants.ps1"; + . "$PSScriptRoot/../lib/Deployment.ps1"; + . "$PSScriptRoot/../lib/PowerManagement.ps1"; + . "$PSScriptRoot/../lib/Registry.ps1"; + . "$PSScriptRoot/../lib/Security.ps1"; + . "$PSScriptRoot/../lib/SoftwareManagement.ps1"; + . "$PSScriptRoot/../lib/System.ps1"; + . "$PSScriptRoot/../lib/Update.ps1"; + . "$PSScriptRoot/../lib/Users.ps1"; . "$PSScriptRoot/../Types/WindowsInstallerAction.ps1"; - . "$PSScriptRoot/../../Common/Scripts/Config.ps1"; - . "$PSScriptRoot/../../Common/Scripts/Operations.ps1"; - . "$PSScriptRoot/../../Common/Scripts/Scripting.ps1"; - . "$PSScriptRoot/../../Common/Scripts/SoftwareManagement.ps1"; + . "$PSScriptRoot/../../lib/Config.ps1"; + . "$PSScriptRoot/../../lib/Operations.ps1"; + . "$PSScriptRoot/../../lib/Scripting.ps1"; + . "$PSScriptRoot/../../lib/SoftwareManagement.ps1"; . "$PSScriptRoot/../../Common/Types/InstallerAction.ps1"; <# diff --git a/scripts/Windows/OS/Setup.ps1 b/scripts/Windows/OS/Setup.ps1 index d3580bc1..cd23cdbb 100644 --- a/scripts/Windows/OS/Setup.ps1 +++ b/scripts/Windows/OS/Setup.ps1 @@ -1,10 +1,10 @@ #!/bin/pwsh -. "$PSScriptRoot/../../Common/Scripts/Scripting.ps1"; +. "$PSScriptRoot/../../lib/Scripting.ps1"; function Start-Setup { param($ConfigurationName) - . "$PSScriptRoot/../../Common/Scripts/Config.ps1"; - . "$PSScriptRoot/../../Common/Scripts/Scripting.ps1"; + . "$PSScriptRoot/../../lib/Config.ps1"; + . "$PSScriptRoot/../../lib/Scripting.ps1"; $Global:InformationPreference = "Continue"; $Global:ErrorActionPreference = "Inquire"; $env:CONFIG_NAME ??= $ConfigurationName; diff --git a/scripts/Windows/Software/aliae/Main.ps1 b/scripts/Windows/Software/aliae/Main.ps1 index ab4b89a1..13bc1c51 100644 --- a/scripts/Windows/Software/aliae/Main.ps1 +++ b/scripts/Windows/Software/aliae/Main.ps1 @@ -1,5 +1,5 @@ -. "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1"; -. "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; +. "$PSScriptRoot/../../lib/SoftwareManagement.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; . "$PSScriptRoot/../../../Common/Types/InstallerAction.ps1"; Start-SoftwareInstaller @args ` diff --git a/scripts/Windows/Software/chocolatey/Main.ps1 b/scripts/Windows/Software/chocolatey/Main.ps1 index 55bec8f8..5167b61d 100644 --- a/scripts/Windows/Software/chocolatey/Main.ps1 +++ b/scripts/Windows/Software/chocolatey/Main.ps1 @@ -1,6 +1,6 @@ using namespace Microsoft.Win32; -. "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; . "$PSScriptRoot/../../../Common/Software/powershell/Profile.ps1"; Start-SoftwareInstaller -Force @args ` diff --git a/scripts/Windows/Software/discord/Main.ps1 b/scripts/Windows/Software/discord/Main.ps1 index b813a8c9..cc922ded 100644 --- a/scripts/Windows/Software/discord/Main.ps1 +++ b/scripts/Windows/Software/discord/Main.ps1 @@ -1,6 +1,6 @@ -. "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1"; -. "$PSScriptRoot/../../Scripts/System.ps1"; -. "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; +. "$PSScriptRoot/../../lib/SoftwareManagement.ps1"; +. "$PSScriptRoot/../../lib/System.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; . "$PSScriptRoot/../../../Common/Types/InstallerAction.ps1"; Start-SoftwareInstaller @args ` diff --git a/scripts/Windows/Software/ext4fsd/Main.ps1 b/scripts/Windows/Software/ext4fsd/Main.ps1 index 81442b9f..cfbb2259 100644 --- a/scripts/Windows/Software/ext4fsd/Main.ps1 +++ b/scripts/Windows/Software/ext4fsd/Main.ps1 @@ -1,5 +1,5 @@ -. "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1"; -. "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; +. "$PSScriptRoot/../../lib/SoftwareManagement.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; . "$PSScriptRoot/../../../Common/Types/InstallerAction.ps1"; Start-SoftwareInstaller -Force @args ` diff --git a/scripts/Windows/Software/firefox/Main.ps1 b/scripts/Windows/Software/firefox/Main.ps1 index 1fdf8171..9090d56d 100644 --- a/scripts/Windows/Software/firefox/Main.ps1 +++ b/scripts/Windows/Software/firefox/Main.ps1 @@ -1,6 +1,6 @@ -. "$PSScriptRoot/../../Scripts/AppAssociations.ps1"; -. "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1"; -. "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; +. "$PSScriptRoot/../../lib/AppAssociations.ps1"; +. "$PSScriptRoot/../../lib/SoftwareManagement.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; Start-SoftwareInstaller @args ` -Installer { diff --git a/scripts/Windows/Software/git/Main.ps1 b/scripts/Windows/Software/git/Main.ps1 index 109dc777..7caa5585 100644 --- a/scripts/Windows/Software/git/Main.ps1 +++ b/scripts/Windows/Software/git/Main.ps1 @@ -1,6 +1,6 @@ -. "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1"; -. "$PSScriptRoot/../../../Common/Scripts/Config.ps1"; -. "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; +. "$PSScriptRoot/../../lib/SoftwareManagement.ps1"; +. "$PSScriptRoot/../../../lib/Config.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; . "$PSScriptRoot/../../../Common/Types/InstallerAction.ps1"; Start-SoftwareInstaller @args ` diff --git a/scripts/Windows/Software/lghub/Main.ps1 b/scripts/Windows/Software/lghub/Main.ps1 index ec6f453c..6316c82e 100644 --- a/scripts/Windows/Software/lghub/Main.ps1 +++ b/scripts/Windows/Software/lghub/Main.ps1 @@ -1,7 +1,7 @@ & { - . "$PSScriptRoot/../../Scripts/Restoration.ps1"; - . "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1"; - . "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; + . "$PSScriptRoot/../../lib/Restoration.ps1"; + . "$PSScriptRoot/../../lib/SoftwareManagement.ps1"; + . "$PSScriptRoot/../../../lib/Software.ps1"; $configPath = "$env:LocalAppData/LGHUB"; <# diff --git a/scripts/Windows/Software/maniaplanet/Main.ps1 b/scripts/Windows/Software/maniaplanet/Main.ps1 index 97ad655d..edf28f22 100644 --- a/scripts/Windows/Software/maniaplanet/Main.ps1 +++ b/scripts/Windows/Software/maniaplanet/Main.ps1 @@ -1,8 +1,8 @@ & { - . "$PSScriptRoot/../../Scripts/Restoration.ps1"; - . "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1"; - . "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; - . "$PSScriptRoot/../../../Common/Scripts/System.ps1"; + . "$PSScriptRoot/../../lib/Restoration.ps1"; + . "$PSScriptRoot/../../lib/SoftwareManagement.ps1"; + . "$PSScriptRoot/../../../lib/Software.ps1"; + . "$PSScriptRoot/../../../lib/System.ps1"; $path = "$HOME/Documents/ManiaPlanet"; Start-SoftwareInstaller @args ` diff --git a/scripts/Windows/Software/msedge-redirect/Main.ps1 b/scripts/Windows/Software/msedge-redirect/Main.ps1 index e8165a10..9173bd7f 100644 --- a/scripts/Windows/Software/msedge-redirect/Main.ps1 +++ b/scripts/Windows/Software/msedge-redirect/Main.ps1 @@ -1,5 +1,5 @@ -. "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1"; -. "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; +. "$PSScriptRoot/../../lib/SoftwareManagement.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; Start-SoftwareInstaller @args ` -Installer { diff --git a/scripts/Windows/Software/nextcloud/Main.ps1 b/scripts/Windows/Software/nextcloud/Main.ps1 index afe002db..be3af320 100644 --- a/scripts/Windows/Software/nextcloud/Main.ps1 +++ b/scripts/Windows/Software/nextcloud/Main.ps1 @@ -1,5 +1,5 @@ -. "$PSScriptRoot/../../Scripts/PowerManagement.ps1"; -. "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; +. "$PSScriptRoot/../../lib/PowerManagement.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; & { <# diff --git a/scripts/Windows/Software/nvs/Main.ps1 b/scripts/Windows/Software/nvs/Main.ps1 index 36830129..32f5599d 100644 --- a/scripts/Windows/Software/nvs/Main.ps1 +++ b/scripts/Windows/Software/nvs/Main.ps1 @@ -1,8 +1,8 @@ using namespace System.Security.AccessControl; using namespace System.Security.Principal; -. "$PSScriptRoot/../../Scripts/Security.ps1"; -. "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; +. "$PSScriptRoot/../../lib/Security.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; . "$PSScriptRoot/../../../Common/Types/InstallerAction.ps1"; Start-SoftwareInstaller @args ` diff --git a/scripts/Windows/Software/oh-my-posh/Main.ps1 b/scripts/Windows/Software/oh-my-posh/Main.ps1 index 41ad24f0..30592b91 100644 --- a/scripts/Windows/Software/oh-my-posh/Main.ps1 +++ b/scripts/Windows/Software/oh-my-posh/Main.ps1 @@ -1,5 +1,5 @@ -. "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1"; -. "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; +. "$PSScriptRoot/../../lib/SoftwareManagement.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; . "$PSScriptRoot/../../../Common/Types/InstallerAction.ps1"; Start-SoftwareInstaller @args ` diff --git a/scripts/Windows/Software/openssh/Main.ps1 b/scripts/Windows/Software/openssh/Main.ps1 index cbfc96cb..02c736e3 100644 --- a/scripts/Windows/Software/openssh/Main.ps1 +++ b/scripts/Windows/Software/openssh/Main.ps1 @@ -1,6 +1,6 @@ using namespace Microsoft.Win32; -. "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; Start-SoftwareInstaller @args ` -Configurator { diff --git a/scripts/Windows/Software/osu!/Main.ps1 b/scripts/Windows/Software/osu!/Main.ps1 index 004fad5e..558abedd 100644 --- a/scripts/Windows/Software/osu!/Main.ps1 +++ b/scripts/Windows/Software/osu!/Main.ps1 @@ -1,8 +1,8 @@ -. "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1"; -. "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; +. "$PSScriptRoot/../../lib/SoftwareManagement.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; & { - . "$PSScriptRoot/../../Scripts/Restoration.ps1"; + . "$PSScriptRoot/../../lib/Restoration.ps1"; Export-ModuleMember -Function @(); $getInstallPath = { diff --git a/scripts/Windows/Software/osu!lazer/Main.ps1 b/scripts/Windows/Software/osu!lazer/Main.ps1 index c0b19811..78e7a518 100644 --- a/scripts/Windows/Software/osu!lazer/Main.ps1 +++ b/scripts/Windows/Software/osu!lazer/Main.ps1 @@ -1,8 +1,8 @@ & { - . "$PSScriptRoot/../../Scripts/Restoration.ps1"; - . "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1"; - . "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; - . "$PSScriptRoot/../../../Common/Scripts/System.ps1"; + . "$PSScriptRoot/../../lib/Restoration.ps1"; + . "$PSScriptRoot/../../lib/SoftwareManagement.ps1"; + . "$PSScriptRoot/../../../lib/Software.ps1"; + . "$PSScriptRoot/../../../lib/System.ps1"; $path = "$env:AppData/osu"; Start-SoftwareInstaller @args ` diff --git a/scripts/Windows/Software/pinned-item/Main.ps1 b/scripts/Windows/Software/pinned-item/Main.ps1 index d0092202..b39a9812 100644 --- a/scripts/Windows/Software/pinned-item/Main.ps1 +++ b/scripts/Windows/Software/pinned-item/Main.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; . "$PSScriptRoot/../../../Common/Software/powershell/Module.ps1"; $parameters = Get-ModuleInstallerComponents "PinnedItem" -NativeOnly -NoProfile; diff --git a/scripts/Windows/Software/powershell/Main.ps1 b/scripts/Windows/Software/powershell/Main.ps1 index c2253ba0..dceb65cf 100644 --- a/scripts/Windows/Software/powershell/Main.ps1 +++ b/scripts/Windows/Software/powershell/Main.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; . "$PSScriptRoot/../../../Common/Types/InstallerAction.ps1"; Start-SoftwareInstaller @args -Inherit "$PSScriptRoot/../../../Common/Software/powershell/Main.ps1"; diff --git a/scripts/Windows/Software/putty/Main.ps1 b/scripts/Windows/Software/putty/Main.ps1 index 0ea8c599..59688072 100644 --- a/scripts/Windows/Software/putty/Main.ps1 +++ b/scripts/Windows/Software/putty/Main.ps1 @@ -1,9 +1,9 @@ using namespace Microsoft.Win32; -. "$PSScriptRoot/../../Scripts/Restoration.ps1"; -. "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1"; -. "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; -. "$PSScriptRoot/../../../Common/Scripts/System.ps1"; +. "$PSScriptRoot/../../lib/Restoration.ps1"; +. "$PSScriptRoot/../../lib/SoftwareManagement.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; +. "$PSScriptRoot/../../../lib/System.ps1"; Start-SoftwareInstaller @args ` -Installer { diff --git a/scripts/Windows/Software/retroarch/Main.ps1 b/scripts/Windows/Software/retroarch/Main.ps1 index e91015fc..f891ded6 100644 --- a/scripts/Windows/Software/retroarch/Main.ps1 +++ b/scripts/Windows/Software/retroarch/Main.ps1 @@ -1,8 +1,8 @@ & { - . "$PSScriptRoot/../../Scripts/Restoration.ps1"; - . "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1"; - . "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; - . "$PSScriptRoot/../../../Common/Scripts/System.ps1"; + . "$PSScriptRoot/../../lib/Restoration.ps1"; + . "$PSScriptRoot/../../lib/SoftwareManagement.ps1"; + . "$PSScriptRoot/../../../lib/Software.ps1"; + . "$PSScriptRoot/../../../lib/System.ps1"; $path = "C:/tools/RetroArch-Win64"; Start-SoftwareInstaller @args ` diff --git a/scripts/Windows/Software/rewasd/Main.ps1 b/scripts/Windows/Software/rewasd/Main.ps1 index 96724dff..ea0b5907 100644 --- a/scripts/Windows/Software/rewasd/Main.ps1 +++ b/scripts/Windows/Software/rewasd/Main.ps1 @@ -1,8 +1,8 @@ & { - . "$PSScriptRoot/../../Scripts/Restoration.ps1"; - . "$PSScriptRoot/../../../Common/Scripts/BrowserAutomation.ps1"; - . "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; - . "$PSScriptRoot/../../../Common/Scripts/System.ps1"; + . "$PSScriptRoot/../../lib/Restoration.ps1"; + . "$PSScriptRoot/../../../lib/BrowserAutomation.ps1"; + . "$PSScriptRoot/../../../lib/Software.ps1"; + . "$PSScriptRoot/../../../lib/System.ps1"; $path = "$env:Public/Documents/reWASD"; diff --git a/scripts/Windows/Software/thunderbird/Main.ps1 b/scripts/Windows/Software/thunderbird/Main.ps1 index 3d663468..ece6058f 100644 --- a/scripts/Windows/Software/thunderbird/Main.ps1 +++ b/scripts/Windows/Software/thunderbird/Main.ps1 @@ -1,8 +1,8 @@ using namespace Microsoft.Win32; -. "$PSScriptRoot/../../Scripts/AppAssociations.ps1"; -. "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1"; -. "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; +. "$PSScriptRoot/../../lib/AppAssociations.ps1"; +. "$PSScriptRoot/../../lib/SoftwareManagement.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; Start-SoftwareInstaller @args ` -Installer { diff --git a/scripts/Windows/Software/tm-nations-forever/Main.ps1 b/scripts/Windows/Software/tm-nations-forever/Main.ps1 index 52a3d2c4..6755304e 100644 --- a/scripts/Windows/Software/tm-nations-forever/Main.ps1 +++ b/scripts/Windows/Software/tm-nations-forever/Main.ps1 @@ -1,6 +1,6 @@ . "$PSScriptRoot/../tm-united-forever/Manage.ps1"; -. "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1"; -. "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; +. "$PSScriptRoot/../../lib/SoftwareManagement.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; $parameters = Get-TMForeverInstallerComponents ` -IconName "TmNationsForever" ` diff --git a/scripts/Windows/Software/tm-united-forever/Main.ps1 b/scripts/Windows/Software/tm-united-forever/Main.ps1 index 6e51efc0..059a59bc 100644 --- a/scripts/Windows/Software/tm-united-forever/Main.ps1 +++ b/scripts/Windows/Software/tm-united-forever/Main.ps1 @@ -1,5 +1,5 @@ . "$PSScriptRoot/Manage.ps1"; -. "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; $parameters = Get-TMForeverInstallerComponents ` -IconName "TmUnitedForever" ` diff --git a/scripts/Windows/Software/tm-united-forever/Manage.ps1 b/scripts/Windows/Software/tm-united-forever/Manage.ps1 index 493f03a6..407cfa2b 100644 --- a/scripts/Windows/Software/tm-united-forever/Manage.ps1 +++ b/scripts/Windows/Software/tm-united-forever/Manage.ps1 @@ -1,5 +1,5 @@ -. "$PSScriptRoot/../../Scripts/Restoration.ps1"; -. "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; +. "$PSScriptRoot/../../lib/Restoration.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; <# .SYNOPSIS diff --git a/scripts/Windows/Software/tobii-gamehub/Main.ps1 b/scripts/Windows/Software/tobii-gamehub/Main.ps1 index 945b74d3..d9a02822 100644 --- a/scripts/Windows/Software/tobii-gamehub/Main.ps1 +++ b/scripts/Windows/Software/tobii-gamehub/Main.ps1 @@ -1,8 +1,8 @@ using namespace Microsoft.Win32; -. "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1"; -. "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; -. "$PSScriptRoot/../../../Common/Scripts/System.ps1"; +. "$PSScriptRoot/../../lib/SoftwareManagement.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; +. "$PSScriptRoot/../../../lib/System.ps1"; Start-SoftwareInstaller @args ` -Installer { diff --git a/scripts/Windows/Software/tobii-ghost/Main.ps1 b/scripts/Windows/Software/tobii-ghost/Main.ps1 index e0d15f02..16d785e5 100644 --- a/scripts/Windows/Software/tobii-ghost/Main.ps1 +++ b/scripts/Windows/Software/tobii-ghost/Main.ps1 @@ -1,6 +1,6 @@ -. "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1"; -. "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; -. "$PSScriptRoot/../../../Common/Scripts/System.ps1"; +. "$PSScriptRoot/../../lib/SoftwareManagement.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; +. "$PSScriptRoot/../../../lib/System.ps1"; Start-SoftwareInstaller @args ` -Installer { diff --git a/scripts/Windows/Software/ubiquiti-unifi-controller/Main.ps1 b/scripts/Windows/Software/ubiquiti-unifi-controller/Main.ps1 index 1a280ae0..6f90a492 100644 --- a/scripts/Windows/Software/ubiquiti-unifi-controller/Main.ps1 +++ b/scripts/Windows/Software/ubiquiti-unifi-controller/Main.ps1 @@ -1,6 +1,6 @@ -. "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1"; -. "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; -. "$PSScriptRoot/../../../Common/Scripts/System.ps1"; +. "$PSScriptRoot/../../lib/SoftwareManagement.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; +. "$PSScriptRoot/../../../lib/System.ps1"; Start-SoftwareInstaller @args ` -UserConfigurator { diff --git a/scripts/Windows/Software/visualstudio/Main.ps1 b/scripts/Windows/Software/visualstudio/Main.ps1 index 9711531c..2bd8daa8 100644 --- a/scripts/Windows/Software/visualstudio/Main.ps1 +++ b/scripts/Windows/Software/visualstudio/Main.ps1 @@ -1,10 +1,10 @@ & { - . "$PSScriptRoot/../../Scripts/Restoration.ps1"; - . "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1"; - . "$PSScriptRoot/../../../Common/Scripts/BrowserAutomation.ps1"; - . "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; - . "$PSScriptRoot/../../../Common/Scripts/SoftwareManagement.ps1"; - . "$PSScriptRoot/../../../Common/Scripts/System.ps1"; + . "$PSScriptRoot/../../lib/Restoration.ps1"; + . "$PSScriptRoot/../../lib/SoftwareManagement.ps1"; + . "$PSScriptRoot/../../../lib/BrowserAutomation.ps1"; + . "$PSScriptRoot/../../../lib/Software.ps1"; + . "$PSScriptRoot/../../../lib/SoftwareManagement.ps1"; + . "$PSScriptRoot/../../../lib/System.ps1"; [System.Tuple[string, string, string][]] $versions = @( [System.Tuple]::Create("visualstudio2019enterprise", "VisualStudio.16.Release", "Microsoft.VisualStudio.Product.Enterprise"), diff --git a/scripts/Windows/Software/vscode/Main.ps1 b/scripts/Windows/Software/vscode/Main.ps1 index 2da8b6da..9121b500 100644 --- a/scripts/Windows/Software/vscode/Main.ps1 +++ b/scripts/Windows/Software/vscode/Main.ps1 @@ -1,5 +1,5 @@ -. "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1"; -. "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; +. "$PSScriptRoot/../../lib/SoftwareManagement.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; . "$PSScriptRoot/../../../Common/Types/InstallerAction.ps1"; Start-SoftwareInstaller @args ` diff --git a/scripts/Windows/Software/windows/Main.ps1 b/scripts/Windows/Software/windows/Main.ps1 index f4b79b85..9c6dc15b 100644 --- a/scripts/Windows/Software/windows/Main.ps1 +++ b/scripts/Windows/Software/windows/Main.ps1 @@ -1,13 +1,13 @@ using namespace Microsoft.Win32; -. "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; . "$PSScriptRoot/../../../Common/Types/InstallerAction.ps1"; & { - . "$PSScriptRoot/../../Scripts/Registry.ps1"; - . "$PSScriptRoot/../../Scripts/Restoration.ps1"; - . "$PSScriptRoot/../../../Common/Scripts/Config.ps1"; - . "$PSScriptRoot/../../../Common/Scripts/System.ps1"; + . "$PSScriptRoot/../../lib/Registry.ps1"; + . "$PSScriptRoot/../../lib/Restoration.ps1"; + . "$PSScriptRoot/../../../lib/Config.ps1"; + . "$PSScriptRoot/../../../lib/System.ps1"; $userFolders = @( "Pictures", diff --git a/scripts/Windows/Software/winget/Main.ps1 b/scripts/Windows/Software/winget/Main.ps1 index 98451f86..da8fdffe 100644 --- a/scripts/Windows/Software/winget/Main.ps1 +++ b/scripts/Windows/Software/winget/Main.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; Start-SoftwareInstaller -Force @args ` -Installer { diff --git a/scripts/Windows/Software/winscp/Main.ps1 b/scripts/Windows/Software/winscp/Main.ps1 index 1f039786..9daf4324 100644 --- a/scripts/Windows/Software/winscp/Main.ps1 +++ b/scripts/Windows/Software/winscp/Main.ps1 @@ -1,9 +1,9 @@ using namespace Microsoft.Win32; -. "$PSScriptRoot/../../Scripts/AppAssociations.ps1"; -. "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1"; -. "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; -. "$PSScriptRoot/../../../Common/Scripts/System.ps1"; +. "$PSScriptRoot/../../lib/AppAssociations.ps1"; +. "$PSScriptRoot/../../lib/SoftwareManagement.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; +. "$PSScriptRoot/../../../lib/System.ps1"; Start-SoftwareInstaller @args ` -Installer { diff --git a/scripts/Windows/Software/zoxide/Main.ps1 b/scripts/Windows/Software/zoxide/Main.ps1 index a9e15435..55077997 100644 --- a/scripts/Windows/Software/zoxide/Main.ps1 +++ b/scripts/Windows/Software/zoxide/Main.ps1 @@ -1,5 +1,5 @@ -. "$PSScriptRoot/../../Scripts/SoftwareManagement.ps1"; -. "$PSScriptRoot/../../../Common/Scripts/Software.ps1"; +. "$PSScriptRoot/../../lib/SoftwareManagement.ps1"; +. "$PSScriptRoot/../../../lib/Software.ps1"; . "$PSScriptRoot/../../../Common/Software/powershell/Profile.ps1"; . "$PSScriptRoot/../../../Common/Types/InstallerAction.ps1"; diff --git a/scripts/Windows/Scripts/AppAssociations.ps1 b/scripts/Windows/lib/AppAssociations.ps1 similarity index 100% rename from scripts/Windows/Scripts/AppAssociations.ps1 rename to scripts/Windows/lib/AppAssociations.ps1 diff --git a/scripts/Windows/Scripts/Constants.ps1 b/scripts/Windows/lib/Constants.ps1 similarity index 100% rename from scripts/Windows/Scripts/Constants.ps1 rename to scripts/Windows/lib/Constants.ps1 diff --git a/scripts/Windows/Scripts/Deployment.ps1 b/scripts/Windows/lib/Deployment.ps1 similarity index 98% rename from scripts/Windows/Scripts/Deployment.ps1 rename to scripts/Windows/lib/Deployment.ps1 index 89fddf01..2acf045c 100644 --- a/scripts/Windows/Scripts/Deployment.ps1 +++ b/scripts/Windows/lib/Deployment.ps1 @@ -1,7 +1,7 @@ . "$PSScriptRoot/PowerManagement.ps1"; . "$PSScriptRoot/SoftwareManagement.ps1"; -. "$PSScriptRoot/../../Common/Scripts/Config.ps1"; -. "$PSScriptRoot/../../Common/Scripts/SoftwareManagement.ps1"; +. "$PSScriptRoot/../../lib/Config.ps1"; +. "$PSScriptRoot/../../lib/SoftwareManagement.ps1"; . "$PSScriptRoot/../../Common/Types/InstallerAction.ps1"; <# diff --git a/scripts/Windows/Scripts/PowerManagement.ps1 b/scripts/Windows/lib/PowerManagement.ps1 similarity index 98% rename from scripts/Windows/Scripts/PowerManagement.ps1 rename to scripts/Windows/lib/PowerManagement.ps1 index 001b2e99..91accabd 100644 --- a/scripts/Windows/Scripts/PowerManagement.ps1 +++ b/scripts/Windows/lib/PowerManagement.ps1 @@ -1,8 +1,8 @@ using namespace Microsoft.Win32; $null = New-Module { - . "$PSScriptRoot/../Scripts/Registry.ps1"; - . "$PSScriptRoot/../../Common/Scripts/Scripting.ps1"; + . "$PSScriptRoot/../lib/Registry.ps1"; + . "$PSScriptRoot/../../lib/Scripting.ps1"; [RegistryKey] $key = $null; $runOncePath = "Software\Microsoft\Windows\CurrentVersion\RunOnce"; $systemRunOncePath = "HKLM:\$runOncePath"; diff --git a/scripts/Windows/Scripts/Registry.ps1 b/scripts/Windows/lib/Registry.ps1 similarity index 100% rename from scripts/Windows/Scripts/Registry.ps1 rename to scripts/Windows/lib/Registry.ps1 diff --git a/scripts/Windows/Scripts/Restoration.ps1 b/scripts/Windows/lib/Restoration.ps1 similarity index 98% rename from scripts/Windows/Scripts/Restoration.ps1 rename to scripts/Windows/lib/Restoration.ps1 index 82d59be7..76d64b32 100644 --- a/scripts/Windows/Scripts/Restoration.ps1 +++ b/scripts/Windows/lib/Restoration.ps1 @@ -1,5 +1,5 @@ using namespace System.Collections.Generic; -. "$PSScriptRoot/../../Common/Scripts/System.ps1"; +. "$PSScriptRoot/../../lib/System.ps1"; $null = New-Module { $pathResolver = { diff --git a/scripts/Windows/Scripts/Security.ps1 b/scripts/Windows/lib/Security.ps1 similarity index 100% rename from scripts/Windows/Scripts/Security.ps1 rename to scripts/Windows/lib/Security.ps1 diff --git a/scripts/Windows/Scripts/SoftwareManagement.ps1 b/scripts/Windows/lib/SoftwareManagement.ps1 similarity index 98% rename from scripts/Windows/Scripts/SoftwareManagement.ps1 rename to scripts/Windows/lib/SoftwareManagement.ps1 index e83cccea..a65e9b1a 100644 --- a/scripts/Windows/Scripts/SoftwareManagement.ps1 +++ b/scripts/Windows/lib/SoftwareManagement.ps1 @@ -1,6 +1,6 @@ $null = New-Module { - . "$PSScriptRoot/../../Common/Scripts/BrowserAutomation.ps1"; - . "$PSScriptRoot/../../Common/Scripts/SoftwareManagement.ps1"; + . "$PSScriptRoot/../../lib/BrowserAutomation.ps1"; + . "$PSScriptRoot/../../lib/SoftwareManagement.ps1"; $chocoRunner = { param( diff --git a/scripts/Windows/Scripts/System.ps1 b/scripts/Windows/lib/System.ps1 similarity index 100% rename from scripts/Windows/Scripts/System.ps1 rename to scripts/Windows/lib/System.ps1 diff --git a/scripts/Windows/Scripts/Tasks.ps1 b/scripts/Windows/lib/Tasks.ps1 similarity index 98% rename from scripts/Windows/Scripts/Tasks.ps1 rename to scripts/Windows/lib/Tasks.ps1 index 637206e3..fb0f377b 100644 --- a/scripts/Windows/Scripts/Tasks.ps1 +++ b/scripts/Windows/lib/Tasks.ps1 @@ -2,7 +2,7 @@ $null = New-Module { . "$PSScriptRoot/Constants.ps1"; . "$PSScriptRoot/Registry.ps1"; . "$PSScriptRoot/../Types/OneShotTask.ps1"; - . "$PSScriptRoot/../../Common/Scripts/Config.ps1"; + . "$PSScriptRoot/../../lib/Config.ps1"; $oneShotTaskName = "PortValhalla OneShot"; $logName = "Application"; $oneShotTrigger = 1337; diff --git a/scripts/Windows/Scripts/Update.ps1 b/scripts/Windows/lib/Update.ps1 similarity index 100% rename from scripts/Windows/Scripts/Update.ps1 rename to scripts/Windows/lib/Update.ps1 diff --git a/scripts/Windows/Scripts/Users.ps1 b/scripts/Windows/lib/Users.ps1 similarity index 98% rename from scripts/Windows/Scripts/Users.ps1 rename to scripts/Windows/lib/Users.ps1 index 8c200338..959fc41d 100644 --- a/scripts/Windows/Scripts/Users.ps1 +++ b/scripts/Windows/lib/Users.ps1 @@ -6,8 +6,8 @@ $null = New-Module { . "$PSScriptRoot/Registry.ps1"; . "$PSScriptRoot/System.ps1"; . "$PSScriptRoot/../Types/OneShotTask.ps1"; - . "$PSScriptRoot/../../Common/Scripts/Config.ps1"; - . "$PSScriptRoot/../../Common/Scripts/Operations.ps1"; + . "$PSScriptRoot/../../lib/Config.ps1"; + . "$PSScriptRoot/../../lib/Operations.ps1"; $loggedInUserOption = "LoggedInUser"; <# diff --git a/scripts/Windows/Scripts/WSL.ps1 b/scripts/Windows/lib/WSL.ps1 similarity index 97% rename from scripts/Windows/Scripts/WSL.ps1 rename to scripts/Windows/lib/WSL.ps1 index 89ae4c65..209ca5c0 100644 --- a/scripts/Windows/Scripts/WSL.ps1 +++ b/scripts/Windows/lib/WSL.ps1 @@ -1,6 +1,6 @@ . "$PSScriptRoot/Constants.ps1"; -. "$PSScriptRoot/../Scripts/Security.ps1"; -. "$PSScriptRoot/../../Common/Scripts/SoftwareManagement.ps1"; +. "$PSScriptRoot/../lib/Security.ps1"; +. "$PSScriptRoot/../../lib/SoftwareManagement.ps1"; <# .SYNOPSIS diff --git a/scripts/Common/Scripts/BrowserAutomation.ps1 b/scripts/lib/BrowserAutomation.ps1 similarity index 100% rename from scripts/Common/Scripts/BrowserAutomation.ps1 rename to scripts/lib/BrowserAutomation.ps1 diff --git a/scripts/Common/Scripts/Config.ps1 b/scripts/lib/Config.ps1 similarity index 93% rename from scripts/Common/Scripts/Config.ps1 rename to scripts/lib/Config.ps1 index 03f1687c..28fd2656 100644 --- a/scripts/Common/Scripts/Config.ps1 +++ b/scripts/lib/Config.ps1 @@ -3,9 +3,9 @@ using namespace System.Management.Automation.Host; $null = New-Module { . "$PSScriptRoot/SoftwareManagement.ps1"; - . "$PSScriptRoot/../../Windows/Scripts/Registry.ps1"; - . "$PSScriptRoot/../../Windows/Scripts/WSL.ps1"; - . "$PSScriptRoot/../../Windows/Types/WindowsInstallerAction.ps1"; + . "$PSScriptRoot/../Windows/lib/Registry.ps1"; + . "$PSScriptRoot/../Windows/lib/WSL.ps1"; + . "$PSScriptRoot/../Windows/Types/WindowsInstallerAction.ps1"; <# .SYNOPSIS @@ -18,7 +18,7 @@ $null = New-Module { return Invoke-ConfigScript "getProfiles"; } else { - return Get-ChildItem "$PSScriptRoot/../../../.config" | ForEach-Object { Split-Path -LeafBase $_ }; + return Get-ChildItem "$PSScriptRoot/../../.config" | ForEach-Object { Split-Path -LeafBase $_ }; } }; @@ -71,7 +71,7 @@ $null = New-Module { [string] $Script ) - $scriptPath = "$PSScriptRoot/../../Common/Scripts/settings.fish"; + $scriptPath = "$PSScriptRoot/settings.fish"; if ($env:CONFIG_NAME -or ($Script -eq "getProfiles")) { $output = & { @@ -82,7 +82,7 @@ $null = New-Module { else { if (-not $env:VALHALLA_FLAKE_ROOT) { $cleanup = { }; - $projectRoot = "$PSScriptRoot/../../.."; + $projectRoot = "$PSScriptRoot/../.."; $archisoDir = "$projectRoot/archiso"; if (Test-Path -PathType Container "$archisoDir") { @@ -94,7 +94,7 @@ $null = New-Module { $cleanup = { & $git restore --staged "$archisoDir" }; } - $env:VALHALLA_FLAKE_ROOT = (Invoke-Nix flake metadata (ConvertTo-LinuxPath "$PSScriptRoot/../../..") --json | ConvertFrom-Json).path; + $env:VALHALLA_FLAKE_ROOT = (Invoke-Nix flake metadata (ConvertTo-LinuxPath "$PSScriptRoot/../..") --json | ConvertFrom-Json).path; & $cleanup *> $null; } diff --git a/scripts/Common/Scripts/Operations.ps1 b/scripts/lib/Operations.ps1 similarity index 94% rename from scripts/Common/Scripts/Operations.ps1 rename to scripts/lib/Operations.ps1 index 6e50b616..ebf5f3ef 100644 --- a/scripts/Common/Scripts/Operations.ps1 +++ b/scripts/lib/Operations.ps1 @@ -3,14 +3,14 @@ using namespace System.Management.Automation.Host; $null = New-Module { . "$PSScriptRoot/Scripting.ps1"; . "$PSScriptRoot/SoftwareManagement.ps1"; - . "$PSScriptRoot/../../Windows/Scripts/Constants.ps1"; - . "$PSScriptRoot/../../Windows/Scripts/PowerManagement.ps1"; - . "$PSScriptRoot/../../Windows/Scripts/Registry.ps1"; - . "$PSScriptRoot/../../Windows/Scripts/Security.ps1"; - . "$PSScriptRoot/../../Windows/Scripts/SoftwareManagement.ps1"; - . "$PSScriptRoot/../../Windows/Scripts/System.ps1"; - . "$PSScriptRoot/../../Windows/Scripts/Tasks.ps1"; - . "$PSScriptRoot/../../Windows/Scripts/WSL.ps1"; + . "$PSScriptRoot/../Windows/lib/Constants.ps1"; + . "$PSScriptRoot/../Windows/lib/PowerManagement.ps1"; + . "$PSScriptRoot/../Windows/lib/Registry.ps1"; + . "$PSScriptRoot/../Windows/lib/Security.ps1"; + . "$PSScriptRoot/../Windows/lib/SoftwareManagement.ps1"; + . "$PSScriptRoot/../Windows/lib/System.ps1"; + . "$PSScriptRoot/../Windows/lib/Tasks.ps1"; + . "$PSScriptRoot/../Windows/lib/WSL.ps1"; <# .SYNOPSIS @@ -142,7 +142,7 @@ $null = New-Module { $path = Join-Path ` "Z:\" ` - ([System.IO.Path]::GetRelativePath("$PSScriptRoot/../../..", $variable.Value)); + ([System.IO.Path]::GetRelativePath("$PSScriptRoot/../..", $variable.Value)); Set-Item "Env:\$name" $path; Write-Host "The new value of ``$name`` is ``$path``"; @@ -203,7 +203,7 @@ $null = New-Module { } if (-not (Test-Winget)) { - . "$PSScriptRoot/../../Windows/Software/winget/Main.ps1"; + . "$PSScriptRoot/../Windows/Software/winget/Main.ps1"; continue; } @@ -253,7 +253,7 @@ $null = New-Module { Install-ChocoPackage selenium-gecko-driver firefox; Install-WingetPackage AutoHotkey.AutoHotkey; - . "$PSScriptRoot/../../Windows/Software/pinned-item/Main.ps1"; + . "$PSScriptRoot/../Windows/Software/pinned-item/Main.ps1"; } Write-Host "Installing PowerShell Modules…"; diff --git a/scripts/Common/Scripts/Scripting.ps1 b/scripts/lib/Scripting.ps1 similarity index 100% rename from scripts/Common/Scripts/Scripting.ps1 rename to scripts/lib/Scripting.ps1 diff --git a/scripts/Common/Scripts/Software.ps1 b/scripts/lib/Software.ps1 similarity index 98% rename from scripts/Common/Scripts/Software.ps1 rename to scripts/lib/Software.ps1 index e3dde1d4..557c9515 100644 --- a/scripts/Common/Scripts/Software.ps1 +++ b/scripts/lib/Software.ps1 @@ -1,10 +1,10 @@ . "$PSScriptRoot/Config.ps1"; . "$PSScriptRoot/Operations.ps1"; . "$PSScriptRoot/System.ps1"; -. "$PSScriptRoot/../Types/InstallerAction.ps1"; +. "$PSScriptRoot/../Common/Types/InstallerAction.ps1"; $null = New-Module { - . "$PSScriptRoot/../Types/InstallerAction.ps1"; + . "$PSScriptRoot/../Common/Types/InstallerAction.ps1"; $userArgument = "name"; function Start-SoftwareInstaller { diff --git a/scripts/Common/Scripts/SoftwareManagement.ps1 b/scripts/lib/SoftwareManagement.ps1 similarity index 100% rename from scripts/Common/Scripts/SoftwareManagement.ps1 rename to scripts/lib/SoftwareManagement.ps1 diff --git a/scripts/Common/Scripts/System.ps1 b/scripts/lib/System.ps1 similarity index 100% rename from scripts/Common/Scripts/System.ps1 rename to scripts/lib/System.ps1 diff --git a/scripts/config.fish b/scripts/lib/config.fish similarity index 100% rename from scripts/config.fish rename to scripts/lib/config.fish diff --git a/scripts/copy-repo.fish b/scripts/lib/copy-repo.fish similarity index 100% rename from scripts/copy-repo.fish rename to scripts/lib/copy-repo.fish diff --git a/scripts/Common/Scripts/eval-flake.fish b/scripts/lib/eval-flake.fish similarity index 86% rename from scripts/Common/Scripts/eval-flake.fish rename to scripts/lib/eval-flake.fish index 8658a2ab..67caa6a2 100755 --- a/scripts/Common/Scripts/eval-flake.fish +++ b/scripts/lib/eval-flake.fish @@ -1,7 +1,7 @@ #!/bin/env fish function evalFlake --argument-names config property set -l argv $argv[3..] - set -l flakePath "$(realpath (status dirname))/../../.." + set -l flakePath "$(realpath (status dirname))/../.." argparse --ignore-unknown "apply=" "fallback=" json -- $argv if [ -z "$_flag_json" ] @@ -20,7 +20,7 @@ function evalFlake --argument-names config property if [ -n "$config" ] set config ".$config" - set _flag_apply "_: ($_flag_apply) ((import $(realpath --relative-to (pwd) "$(status dirname)/../../../lib/eval-attribute.nix")) _)" + set _flag_apply "_: ($_flag_apply) ((import $(realpath --relative-to (pwd) "$(status dirname)/../../lib/eval-attribute.nix")) _)" end PROPERTY="$property" \ diff --git a/scripts/Common/Scripts/hooks.fish b/scripts/lib/hooks.fish similarity index 100% rename from scripts/Common/Scripts/hooks.fish rename to scripts/lib/hooks.fish diff --git a/scripts/Common/Scripts/profile-base.fish b/scripts/lib/profile-base.fish similarity index 100% rename from scripts/Common/Scripts/profile-base.fish rename to scripts/lib/profile-base.fish diff --git a/scripts/Common/Scripts/settings.fish b/scripts/lib/settings.fish similarity index 96% rename from scripts/Common/Scripts/settings.fish rename to scripts/lib/settings.fish index 773944d2..de16c2aa 100755 --- a/scripts/Common/Scripts/settings.fish +++ b/scripts/lib/settings.fish @@ -4,7 +4,7 @@ function isConfigured -S end function selectProfile -S -a result - source "$(status dirname)/../../../lib/modules/partition/select.fish" + source "$(status dirname)/../../lib/modules/partition/select.fish" set -l file (mktemp) set -l header NAME set -l profiles diff --git a/scripts/Common/Scripts/software.fish b/scripts/lib/software.fish similarity index 100% rename from scripts/Common/Scripts/software.fish rename to scripts/lib/software.fish diff --git a/scripts/Common/Scripts/wait-network.fish b/scripts/lib/wait-network.fish similarity index 100% rename from scripts/Common/Scripts/wait-network.fish rename to scripts/lib/wait-network.fish diff --git a/winiso/deploy.fish b/winiso/deploy.fish index 18fae779..d05c0f7f 100755 --- a/winiso/deploy.fish +++ b/winiso/deploy.fish @@ -209,11 +209,11 @@ begin and chmod u+w "$rootDir" and mkdir -p "$projectPath" and cp -r "$pwsh[4]" "$winOverlay/$systemDrivePath/$pwshPath" - and fish "$dir/../scripts/copy-repo.fish" "$projectPath" + and fish "$dir/../scripts/lib/copy-repo.fish" "$projectPath" and rm -rf "$projectPath/archiso" and begin - source "$dir/../scripts/Common/Scripts/settings.fish" + source "$dir/../scripts/lib/settings.fish" and for name in (getProfiles | jq '.[]' --raw-output0 | string split0) set -l CONFIG_NAME "$name"