Rename config script
This commit is contained in:
parent
3291928a11
commit
1ba4113e56
12 changed files with 13 additions and 13 deletions
|
@ -8,7 +8,7 @@ begin
|
|||
end
|
||||
|
||||
function configureSW -V dir
|
||||
source "$dir/../../../Common/Scripts/config.fish"
|
||||
source "$dir/../../../Common/Scripts/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")
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
begin
|
||||
set -l dir (status dirname)
|
||||
source "$dir/../../Common/OS/setup.fish"
|
||||
source "$dir/../../Common/Scripts/config.fish"
|
||||
source "$dir/../../Common/Scripts/settings.fish"
|
||||
|
||||
function runChroot -S
|
||||
arch-chroot $argv
|
||||
|
|
|
@ -9,7 +9,7 @@ begin
|
|||
|
||||
|
||||
function configureSW -V dir
|
||||
. "$dir/../../../Common/Scripts/config.fish"
|
||||
. "$dir/../../../Common/Scripts/settings.fish"
|
||||
|
||||
if isOSEnabled hidpi
|
||||
begin
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/env fish
|
||||
set -l dir (status dirname)
|
||||
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"
|
||||
|
||||
if [ (id -u) -eq 0 ]
|
||||
|
@ -79,7 +79,7 @@ else
|
|||
|
||||
runHook initializeUsers || begin
|
||||
if [ -n "$deployScript" ]
|
||||
source "$dir/../Scripts/config.fish"
|
||||
source "$dir/../Scripts/settings.fish"
|
||||
|
||||
for name in (getUsers | jq '.[]' --raw-output0 | string split0)
|
||||
echo "Configuring user `$name`..."
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/env fish
|
||||
function runSetup
|
||||
set -l dir (status dirname)
|
||||
source "$dir/../Scripts/config.fish"
|
||||
source "$dir/../Scripts/settings.fish"
|
||||
source "$dir/../Scripts/hooks.fish"
|
||||
|
||||
if [ -z "$CONFIG_NAME" ]
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/env fish
|
||||
set -l dir (status dirname)
|
||||
source "$dir/../Scripts/config.fish"
|
||||
source "$dir/../Scripts/settings.fish"
|
||||
set -l users (getUsers)
|
||||
|
||||
echo "Creating users..."
|
||||
|
|
|
@ -61,7 +61,7 @@ $null = New-Module {
|
|||
|
||||
<#
|
||||
.SYNOPSIS
|
||||
Runs a script based on the `config.fish` script.
|
||||
Runs a script based on the `settings.fish` script.
|
||||
|
||||
.PARAMETER Script
|
||||
The script to run.
|
||||
|
@ -71,7 +71,7 @@ $null = New-Module {
|
|||
[string] $Script
|
||||
)
|
||||
|
||||
$scriptPath = "$PSScriptRoot/../../Common/Scripts/config.fish";
|
||||
$scriptPath = "$PSScriptRoot/../../Common/Scripts/settings.fish";
|
||||
|
||||
if ($env:CONFIG_NAME -or ($Script -eq "getProfiles")) {
|
||||
$output = & {
|
||||
|
|
|
@ -48,7 +48,7 @@ begin
|
|||
set -l args $_flag_force
|
||||
set -l name $argv[1]
|
||||
set -l action $argv[2]
|
||||
source "$dir/config.fish"
|
||||
source "$dir/settings.fish"
|
||||
|
||||
if [ -n "$_flag_force" ]
|
||||
set force true
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/env fish
|
||||
begin
|
||||
set -l dir (status dirname)
|
||||
source "$dir/../../Scripts/config.fish"
|
||||
source "$dir/../../Scripts/settings.fish"
|
||||
source "$dir/../../Scripts/software.fish"
|
||||
|
||||
function configureSW
|
||||
|
|
|
@ -8,7 +8,7 @@ begin
|
|||
end
|
||||
|
||||
function userConfig -V dir -a name
|
||||
source "$dir/../../Scripts/config.fish"
|
||||
source "$dir/../../Scripts/settings.fish"
|
||||
set -l key "programs.rclone.configurations"
|
||||
set -l configs (getUserConfig "$name" "$key" --apply "builtins.attrNames" --json)
|
||||
|
||||
|
|
|
@ -213,7 +213,7 @@ begin
|
|||
and rm -rf "$projectPath/archiso"
|
||||
|
||||
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)
|
||||
set -l CONFIG_NAME "$name"
|
||||
|
|
Loading…
Reference in a new issue