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

Rename config script

Browse source
This commit is contained in:
Manuel Thalmann 2024-11-01 00:38:33 +01:00
parent 3291928a11
commit 1ba4113e56
12 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/Arch/Config/SecureBoot/main.fish
View file

@ -8,7 +8,7 @@ begin
end end
function configureSW -V dir function configureSW -V dir
source "$dir/../../../Common/Scripts/config.fish" source "$dir/../../../Common/Scripts/settings.fish"
set -l label (getOSConfig boot.label) set -l label (getOSConfig boot.label)
set -l efiDir (getOSConfig boot.efiMountPoint) set -l efiDir (getOSConfig boot.efiMountPoint)
set -l bootNums (efibootmgr | sed "/$label/{ s/^.*Boot\([[:digit:]]\+\)\*.*\$/\1/; p; }; d") set -l bootNums (efibootmgr | sed "/$label/{ s/^.*Boot\([[:digit:]]\+\)\*.*\$/\1/; p; }; d")

2
scripts/Arch/OS/setup.fish
View file

@ -2,7 +2,7 @@
begin begin
set -l dir (status dirname) set -l dir (status dirname)
source "$dir/../../Common/OS/setup.fish" source "$dir/../../Common/OS/setup.fish"
source "$dir/../../Common/Scripts/config.fish" source "$dir/../../Common/Scripts/settings.fish"
function runChroot -S function runChroot -S
arch-chroot $argv arch-chroot $argv

2
scripts/Arch/Software/steam/main.fish
View file

@ -9,7 +9,7 @@ begin
function configureSW -V dir function configureSW -V dir
. "$dir/../../../Common/Scripts/config.fish" . "$dir/../../../Common/Scripts/settings.fish"
if isOSEnabled hidpi if isOSEnabled hidpi
begin begin

4
scripts/Common/OS/install.fish
View file

@ -1,7 +1,7 @@
#!/bin/env fish #!/bin/env fish
set -l dir (status dirname) set -l dir (status dirname)
set -l cmdline (cat /proc/$fish_pid/cmdline | string split0) set -l cmdline (cat /proc/$fish_pid/cmdline | string split0)
source "$dir/../Scripts/config.fish" source "$dir/../Scripts/settings.fish"
source "$dir/../Scripts/hooks.fish" source "$dir/../Scripts/hooks.fish"
if [ (id -u) -eq 0 ] if [ (id -u) -eq 0 ]
@ -79,7 +79,7 @@ else
runHook initializeUsers || begin runHook initializeUsers || begin
if [ -n "$deployScript" ] if [ -n "$deployScript" ]
source "$dir/../Scripts/config.fish" source "$dir/../Scripts/settings.fish"
for name in (getUsers | jq '.[]' --raw-output0 | string split0) for name in (getUsers | jq '.[]' --raw-output0 | string split0)
echo "Configuring user `$name`..." echo "Configuring user `$name`..."

2
scripts/Common/OS/setup.fish
View file

@ -1,7 +1,7 @@
#!/bin/env fish #!/bin/env fish
function runSetup function runSetup
set -l dir (status dirname) set -l dir (status dirname)
source "$dir/../Scripts/config.fish" source "$dir/../Scripts/settings.fish"
source "$dir/../Scripts/hooks.fish" source "$dir/../Scripts/hooks.fish"
if [ -z "$CONFIG_NAME" ] if [ -z "$CONFIG_NAME" ]

2
scripts/Common/OS/users.fish
View file

@ -1,6 +1,6 @@
#!/bin/env fish #!/bin/env fish
set -l dir (status dirname) set -l dir (status dirname)
source "$dir/../Scripts/config.fish" source "$dir/../Scripts/settings.fish"
set -l users (getUsers) set -l users (getUsers)
echo "Creating users..." echo "Creating users..."

4
scripts/Common/Scripts/Config.ps1
View file

@ -61,7 +61,7 @@ $null = New-Module {
<# <#
.SYNOPSIS .SYNOPSIS
Runs a script based on the `config.fish` script. Runs a script based on the `settings.fish` script.
.PARAMETER Script .PARAMETER Script
The script to run. The script to run.
@ -71,7 +71,7 @@ $null = New-Module {
[string] $Script [string] $Script
) )
$scriptPath = "$PSScriptRoot/../../Common/Scripts/config.fish"; $scriptPath = "$PSScriptRoot/../../Common/Scripts/settings.fish";
if ($env:CONFIG_NAME -or ($Script -eq "getProfiles")) { if ($env:CONFIG_NAME -or ($Script -eq "getProfiles")) {
$output = & { $output = & {

0
scripts/Common/Scripts/config.fish → scripts/Common/Scripts/settings.fish
View file

2
scripts/Common/Scripts/software.fish
View file

@ -48,7 +48,7 @@ begin
set -l args $_flag_force set -l args $_flag_force
set -l name $argv[1] set -l name $argv[1]
set -l action $argv[2] set -l action $argv[2]
source "$dir/config.fish" source "$dir/settings.fish"
if [ -n "$_flag_force" ] if [ -n "$_flag_force" ]
set force true set force true

2
scripts/Common/Software/grub/main.fish
View file

@ -1,7 +1,7 @@
#!/bin/env fish #!/bin/env fish
begin begin
set -l dir (status dirname) set -l dir (status dirname)
source "$dir/../../Scripts/config.fish" source "$dir/../../Scripts/settings.fish"
source "$dir/../../Scripts/software.fish" source "$dir/../../Scripts/software.fish"
function configureSW function configureSW

2
scripts/Common/Software/rclone/main.fish
View file

@ -8,7 +8,7 @@ begin
end end
function userConfig -V dir -a name function userConfig -V dir -a name
source "$dir/../../Scripts/config.fish" source "$dir/../../Scripts/settings.fish"
set -l key "programs.rclone.configurations" set -l key "programs.rclone.configurations"
set -l configs (getUserConfig "$name" "$key" --apply "builtins.attrNames" --json) set -l configs (getUserConfig "$name" "$key" --apply "builtins.attrNames" --json)

2
winiso/deploy.fish
View file

@ -213,7 +213,7 @@ begin
and rm -rf "$projectPath/archiso" and rm -rf "$projectPath/archiso"
and begin and begin
source "$dir/../scripts/Common/Scripts/config.fish" source "$dir/../scripts/Common/Scripts/settings.fish"
and for name in (getProfiles | jq '.[]' --raw-output0 | string split0) and for name in (getProfiles | jq '.[]' --raw-output0 | string split0)
set -l CONFIG_NAME "$name" set -l CONFIG_NAME "$name"